From fb45bad8d9881a581f0779b086a83d0d07633bed Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Mon, 7 May 2018 12:06:47 +0100
Subject: [PATCH] Removed .orig

---
 .../interfaces/PumpDescription.java.orig      | 85 -------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java.orig

diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java.orig b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java.orig
deleted file mode 100644
index 7995070a4d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java.orig
+++ /dev/null
@@ -1,85 +0,0 @@
-package info.nightscout.androidaps.interfaces;
-
-/**
- * Created by mike on 08.12.2016.
- */
-
-public class PumpDescription {
-    public static final int NONE = 0;
-    public static final int PERCENT = 0x01;
-    public static final int ABSOLUTE = 0x02;
-
-    public boolean isBolusCapable = true;
-    public double bolusStep = 0.1d;
-
-    public boolean isExtendedBolusCapable = true;
-    public double extendedBolusStep = 0.1d;
-    public double extendedBolusDurationStep = 30;
-    public double extendedBolusMaxDuration = 12 * 60;
-
-    public boolean isTempBasalCapable = true;
-    public int tempBasalStyle = PERCENT;
-
-    public int maxTempPercent = 200;
-    public int tempPercentStep = 10;
-
-    public double maxTempAbsolute = 10;
-    public double tempAbsoluteStep = 0.05d;
-
-    public int tempDurationStep = 60;
-    public boolean tempDurationStep15mAllowed = false;
-    public boolean tempDurationStep30mAllowed = false;
-    public int tempMaxDuration = 12 * 60;
-
-
-    public boolean isSetBasalProfileCapable = true;
-    public double basalStep = 0.01d;
-    public double basalMinimumRate = 0.04d;
-
-    public boolean isRefillingCapable = false;
-
-    public boolean storesCarbInfo = true;
-
-<<<<<<< HEAD
-
-    public void resetSettings()
-    {
-        isBolusCapable = true;
-        bolusStep = 0.1d;
-
-        isExtendedBolusCapable = true;
-        extendedBolusStep = 0.1d;
-        extendedBolusDurationStep = 30;
-        extendedBolusMaxDuration = 12 * 60;
-
-        isTempBasalCapable = true;
-        tempBasalStyle = PERCENT;
-
-        maxTempPercent = 200;
-        tempPercentStep = 10;
-
-        maxTempAbsolute = 10;
-        tempAbsoluteStep = 0.05d;
-
-        tempDurationStep = 60;
-        tempMaxDuration = 12 * 60;
-
-
-        isSetBasalProfileCapable = true;
-        basalStep = 0.01d;
-        basalMinimumRate = 0.04d;
-
-        isRefillingCapable = false;
-
-        storesCarbInfo = true;
-
-    }
-
-
-=======
-    public boolean is30minBasalRatesCapable = false;
-
-    public boolean supportsTDDs = false;
-    public boolean needsManualTDDLoad = true;
->>>>>>> dev
-}