Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
fix merge issue
n8fr837b279c81cf4
diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.javaindex db74952..0b91765 100644--- a/src/main/java/org/havenapp/main/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@ -43,8 +43,6 @@ import java.io.IOException;import static org.havenapp.main.Utils.getTimerText;public class MonitorActivity extends FragmentActivity implements TimePickerDialog.OnTimeSetListener {--public class MonitorActivity extends FragmentActivity {private PreferenceManager preferences = null;