some more

companion/HELP.MD

@@ -32,9 +32,9 @@ There is a wide variety of actions supported. The best way to discover them is h
 
 
 ### Other information (Disclaimer)
-This information is mentioned on the openCountdown git page, however I would like to reiterate here.
-Please do not use openCountdown for military or life-depending applications. Please also refrain from using openCountdown for launching rockets.
+This information is mentioned on the soundr git page, however I would like to reiterate here.
+Please do not use soundr for military or life-depending applications.
 
 ## Getting further help
 If something does not work or you need further help, either raise an issue or send me an E-Mail. I will try to help you as soon as possible.
-I can not supply 24/7 support. I am a student and I have a life outside of programming.
+I can not supply 24/7 support. I am a student and I have a life outside of programming.

package.json

@@ -1,6 +1,24 @@
 {
   "name": "pnh-soundr",
+<<<<<<< HEAD
   "version": "1.0.0",
+=======
+  "version": "1.0.2",
+  "api_version": "1.0.0",
+  "keywords": [
+    "Software",
+    "Soundr",
+    "Sound"
+  ],
+  "manufacturer": "[Project-Name-Here]",
+  "product": "Soundr",
+  "shortname": "soundr",
+  "description": "Module to control Soundr",
+  "homepage": "example.com",
+  "bugs": {
+    "url": "example.com"
+  },
+>>>>>>> 2e0aec79605164d580acab56eca6ab4b28f47deb
   "repository": {
     "type": "git",
     "url": "git+github.com/bitfocus/companion-module-pnh-soundr.git"