From a2b1244d541ddbbbeb7521ddb40d0d4049211289 Mon Sep 17 00:00:00 2001
From: Dave C-J <conway@uk.ibm.com>
Date: Wed, 3 Sep 2014 22:18:42 +0100
Subject: [PATCH] resolving merg conflicts with icons etc

---
 io/ping/88-ping.html       |  8 --------
 io/wol/39-wol.html         |  4 ----
 social/nma/57-nma.html     |  4 ----
 social/prowl/57-prowl.html | 12 ------------
 4 files changed, 28 deletions(-)

diff --git a/io/ping/88-ping.html b/io/ping/88-ping.html
index 54407989..5415302d 100644
--- a/io/ping/88-ping.html
+++ b/io/ping/88-ping.html
@@ -16,19 +16,11 @@
 
 <script type="text/x-red" data-template-name="ping">
     <div class="form-row">
-<<<<<<< HEAD
         <label for="node-input-host"><i class="fa fa-dot-circle-o"></i> Target</label>
         <input type="text" id="node-input-host" placeholder="www.google.com">
     </div>
     <div class="form-row">
         <label for="node-input-timer"><i class="fa fa-repeat"></i> Ping (S)</label>
-=======
-        <label for="node-input-host"><i class="fa fa-tasks"></i> Target</label>
-        <input type="text" id="node-input-host" placeholder="www.google.com">
-    </div>
-    <div class="form-row">
-        <label for="node-input-timer"><i class="fa fa-tasks"></i> Ping (S)</label>
->>>>>>> fdb62b548520519558fb23a7606831ffd06a90d3
         <input type="text" id="node-input-timer" placeholder="20">
     </div>
     <div class="form-row">
diff --git a/io/wol/39-wol.html b/io/wol/39-wol.html
index 7ba206bb..93ce1e68 100644
--- a/io/wol/39-wol.html
+++ b/io/wol/39-wol.html
@@ -17,11 +17,7 @@
 <script type="text/x-red" data-template-name="wake on lan">
     <div class="form-row">
         <label for="node-input-mac"><i class="fa fa-globe"></i> MAC Address</label>
-<<<<<<< HEAD
         <input type="text" id="node-input-mac" placeholder="e.g. DE:AD:BE:EF:FE:ED">
-=======
-        <input type="text" id="node-input-mac" placeholder="DE:AD:BE:EF:FE:ED">
->>>>>>> fdb62b548520519558fb23a7606831ffd06a90d3
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
diff --git a/social/nma/57-nma.html b/social/nma/57-nma.html
index c8cb788d..72efa216 100644
--- a/social/nma/57-nma.html
+++ b/social/nma/57-nma.html
@@ -20,11 +20,7 @@
         <input type="text" id="node-input-title" placeholder="Node-RED">
     </div>
     <div class="form-row">
-<<<<<<< HEAD
         <label for="node-config-input-pushkey"><i class="fa fa-key"></i> API Key</label>
-=======
-        <label for="node-config-input-pushkey"><i class="fa fa-lock"></i> API Key</label>
->>>>>>> fdb62b548520519558fb23a7606831ffd06a90d3
         <input type="password" id="node-config-input-pushkey">
     </div>
     <br/>
diff --git a/social/prowl/57-prowl.html b/social/prowl/57-prowl.html
index 2d4d6dd2..bc90e6df 100644
--- a/social/prowl/57-prowl.html
+++ b/social/prowl/57-prowl.html
@@ -16,7 +16,6 @@
 
 <script type="text/x-red" data-template-name="prowl">
     <div class="form-row">
-<<<<<<< HEAD
         <label for="node-input-title"><i class="fa fa-flag"></i> Title</label>
         <input type="text" id="node-input-title" placeholder="Node-RED">
     </div>
@@ -26,17 +25,6 @@
     </div>
     <div class="form-row">
         <label for="node-config-input-pushkey"><i class="fa fa-key"></i> API Key</label>
-=======
-        <label for="node-input-title"><i class="fa fa-tag"></i> Title</label>
-        <input type="text" id="node-input-title" placeholder="Node-RED">
-    </div>
-    <div class="form-row">
-        <label for="node-input-priority"><i class="fa fa-tag"></i> Priority</label>
-        <input type="text" id="node-input-priority" placeholder="0">
-    </div>
-    <div class="form-row">
-        <label for="node-config-input-pushkey"><i class="fa fa-lock"></i> API Key</label>
->>>>>>> fdb62b548520519558fb23a7606831ffd06a90d3
         <input type="password" id="node-config-input-pushkey">
     </div>
     <br/>