frodovdr
/
node-red-nodes
mirror of https://github.com/node-red/node-red-nodes.git
1
0
Fork 0
Code Issues Releases Wiki Activity

resolving merg conflicts with icons etc

This commit is contained in:
Dave C-J 2014-09-03 22:18:42 +01:00
parent fe44018250
commit a2b1244d54
4 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
io/ping/88-ping.html
View File

@ -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">

4
io/wol/39-wol.html
View File

@ -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>

4
social/nma/57-nma.html
View File

@ -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/>

12
social/prowl/57-prowl.html
View File

@ -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/>