From db01c3474cf8e9b4747076b14f84dcb010984242 Mon Sep 17 00:00:00 2001
From: Gerrit Niezen <gerrit.niezen@gmail.com>
Date: Wed, 21 Jun 2017 17:02:38 +0100
Subject: [PATCH] go back to using isBrowser

---
 lib/drivers/medtronic/medtronicDriver.js    | 4 ++--
 lib/drivers/medtronic/medtronicSimulator.js | 4 ++--
 lib/drivers/medtronic/processData.js        | 4 ++--
 manifest.json                               | 4 ----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/drivers/medtronic/medtronicDriver.js b/lib/drivers/medtronic/medtronicDriver.js
index ab5ab77717..f3896eb238 100644
--- a/lib/drivers/medtronic/medtronicDriver.js
+++ b/lib/drivers/medtronic/medtronicDriver.js
@@ -27,8 +27,8 @@ var common = require('../../commonFunctions');
 var medtronicSimulator = require('./medtronicSimulator');
 var crcCalculator = require('../../crc.js');
 
-var isElectron = require('is-electron');
-var debug = isElectron() ? require('bows')('MedtronicDriver') : console.log;
+var isBrowser = typeof window !== 'undefined';
+var debug = isBrowser ? require('bows')('MedtronicDriver') : console.log;
 
 module.exports = function (config) {
   var cfg = _.clone(config);
diff --git a/lib/drivers/medtronic/medtronicSimulator.js b/lib/drivers/medtronic/medtronicSimulator.js
index 08ea6cb8e3..78964359f2 100644
--- a/lib/drivers/medtronic/medtronicSimulator.js
+++ b/lib/drivers/medtronic/medtronicSimulator.js
@@ -24,8 +24,8 @@ var util = require('util');
 var annotate = require('../../eventAnnotations');
 var common = require('../../commonFunctions');
 
-var isElectron = require('is-electron');
-var debug = isElectron() ? require('bows')('MedtronicDriver') : console.log;
+var isBrowser = typeof window !== 'undefined';
+var debug = isBrowser ? require('bows')('MedtronicDriver') : console.log;
 var __DEBUG__ = __DEBUG__ || true;
 
 /**
diff --git a/lib/drivers/medtronic/processData.js b/lib/drivers/medtronic/processData.js
index a89414d249..0cddb8ae58 100644
--- a/lib/drivers/medtronic/processData.js
+++ b/lib/drivers/medtronic/processData.js
@@ -25,8 +25,8 @@ var common = require('../../commonFunctions');
 var annotate = require('../../eventAnnotations');
 var TZOUtil = require('../../TimezoneOffsetUtil');
 
-var isElectron = require('is-electron');
-var debug = isElectron() ? require('bows')('MedtronicDriver') : console.log;
+var isBrowser = typeof window !== 'undefined';
+var debug = isBrowser ? require('bows')('MedtronicDriver') : console.log;
 var __DEBUG__ = __DEBUG__ || true;
 
 var RECORD_TYPES = {
diff --git a/manifest.json b/manifest.json
index ae6020e111..ce56a6a9c1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,11 +2,7 @@
   "manifest_version": 2,
   "name": "Tidepool Uploader",
   "short_name": "Uploader",
-<<<<<<< HEAD
-  "version": "0.305.32",
-=======
   "version": "0.306.1",
->>>>>>> master
   "description": "The Tidepool Uploader helps you get your data from insulin pumps, CGMs and BG meters into Tidepool’s secure cloud platform.",
   "minimum_chrome_version": "38",
   "icons": {