Browse Source

Delete 'package.json.orig'

Gareth 6 years ago
parent
commit
4847c25ed7
1 changed files with 0 additions and 46 deletions
  1. 0 46
      package.json.orig

+ 0 - 46
package.json.orig

@@ -1,46 +0,0 @@
-{
-<<<<<<< HEAD
-    "name"         : "node-red-contrib-ramp-thermostat",
-    "version"      : "0.5.0",
-    "description"  : "A Node-RED node that emulates a thermostat",
-    "dependencies": {
-    },
-    "keywords": [ 
-      "node-red",
-      "thermostat",
-      "profile",
-      "heating control",
-      "tmeperature control",
-      "energy saving",
-      "multtple heating zones",
-      "single room temperature control"
-=======
-    "name": "node-red-contrib-ramp-thermostat",
-    "version": "0.5.0",
-    "description": "A Node-RED node that emulates a thermostat",
-    "dependencies": {},
-    "keywords": [
-        "node-red",
-        "thermostat",
-        "profile",
-        "heating control",
-        "tmeperature control",
-        "energy saving",
-        "multtple heating zones",
-        "single room temperature control"
->>>>>>> drweaver/master
-    ],
-    "author": "cflurin",
-    "contributors": [
-        "drweaver"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/cflurin/node-red-contrib-ramp-thermostat.git"
-    },
-    "node-red": {
-        "nodes": {
-            "ramp-thermostat": "ramp-thermostat/ramp-thermostat.js"
-        }
-    }
-}