From 855fe8c226731b8ff4b919f4d6590d9c2d88c1dc Mon Sep 17 00:00:00 2001
From: "jgwashburn@gmail.com" <jgwashburn@gmail.com>
Date: Sun, 27 Nov 2016 10:58:54 -0800
Subject: [PATCH] complete merge
---
.../nightscout/android/medtronic/GetHmacAndKeyActivity.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java b/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
index 691bef2..d2f50fa 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
@@ -385,12 +385,9 @@ public class GetHmacAndKeyActivity extends AppCompatActivity implements LoaderCa
mStatus = getString(R.string.error_class_not_found_exception);
return false;
}
-<<<<<<< HEAD
- mStatus = getString(R.string.error_http_response);
-=======
mStatus = getString(R.string.error_http_response) + "http response: " + response.getStatusLine();
->>>>>>> specify_hostname
+
return false;
}
--
GitLab