From 38237290fc8fa3a6769e106cddac12c961f03a0d Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Sat, 11 Aug 2018 21:44:28 +0100
Subject: [PATCH] Merge branches 'master' and 'withoutbit' of
https://github.com/georgemuresan/Internship into withoutbit
# Conflicts:
# .idea/caches/build_file_checksums.ser
---
app/src/main/java/com/example/admin/sleepbetter/MainMenu.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java b/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
index 0e0cee8..3110ae0 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
+++ b/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
@@ -428,7 +428,7 @@ public class MainMenu extends AppCompatActivity implements NavigationView.OnNavi
break;
}
- setSpecialAlarmManager(21, 45, "Oups:", "Checking questionnaire");
+ setSpecialAlarmManager(0, 1, "Oups:", "Checking questionnaire");
}
public static class Broadcast1 extends BroadcastReceiver {
--
GitLab