From c034f77b71e37a77bc87b08f2681c9d06ff7303f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 11 Nov 2016 13:09:50 +0100
Subject: [PATCH] fix merge conflict 2

---
 app/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f90824bb61..69d0701c72 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -342,5 +342,4 @@
     <string name="pumpNotInitialized">Pump not initialized!</string>
     <string name="primefill">Prime/Fill</string>
     <string name="fillwarning">Please make sure the amount matches the specification of your infusion set!</string>
->>>>>>> ad475ace90c312fb3e535740456d8305f597f889
 </resources>