Skip to content
Snippets Groups Projects
Commit 38237290 authored by George Muresan's avatar George Muresan
Browse files

Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	.idea/caches/build_file_checksums.ser
parent 7eb1cad3
No related branches found
No related tags found
No related merge requests found
...@@ -428,7 +428,7 @@ public class MainMenu extends AppCompatActivity implements NavigationView.OnNavi ...@@ -428,7 +428,7 @@ public class MainMenu extends AppCompatActivity implements NavigationView.OnNavi
break; break;
} }
setSpecialAlarmManager(21, 45, "Oups:", "Checking questionnaire"); setSpecialAlarmManager(0, 1, "Oups:", "Checking questionnaire");
} }
public static class Broadcast1 extends BroadcastReceiver { public static class Broadcast1 extends BroadcastReceiver {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment