From d0806802ebf50accc4c67d8e4ff91db9c8431208 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Fri, 10 Nov 2017 00:19:13 +0100
Subject: [PATCH] compile fixes

---
 .../nightscout/androidaps/plugins/PumpCombo/ComboFragment.java   | 1 -
 app/src/main/res/values/strings.xml                              | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
index c3a46328aa..5ff0b7c3d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
@@ -13,7 +13,6 @@ import android.widget.TextView;
 import com.squareup.otto.Subscribe;
 
 import org.apache.commons.lang3.StringUtils;
-import org.ocpsoft.prettytime.PrettyTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e50ff5682..f3c7943453 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -802,5 +802,6 @@
     <string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last minute. For safety reasons this is disallowed.</string>
     <string name="combo_pump_state_initializing">Initializing</string>
     <string name="combo_pump_connected_now">Now</string>
+    <string name="pump_history">pump history</string>
 </resources>