From f9a47a89bcfd4fe9c8eea141d0ace60fdaf4c21a Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Fri, 8 Jan 2016 23:14:17 +0530
Subject: [PATCH] Merge conflicts

---
 .../type-view.hbs                             | 15 ++--
 .../type-view.hbs                             | 89 ++++++++++++-------
 2 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
index dda9ac6c23..d7ee1f0dc0 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
@@ -169,18 +169,20 @@
                                                                      credentials.
             <i>(Use server URL as [&nbsp;https://&lt;WSO2_IoT_SERVER_HOST&gt;:&lt;SERVER_PORT&gt;&nbsp;] and click on
                 <strong>Register Device</strong> button.)</i></li>
-               the <strong>Enroll Device</strong> button.)</i>
+        the <strong>Enroll Device</strong> button.)</i>
 
-            <a href="{{@unit.publicUri}}/images/registerView.png" target="_blank" class="padding-top-double">
-                <img src="{{@unit.publicUri}}/images/registerView.png" class="img-responsive">
-            </a>
+        <a href="{{@unit.publicUri}}/images/registerView.png" target="_blank"
+           class="padding-top-double">
+            <img src="{{@unit.publicUri}}/images/registerView.png" class="img-responsive">
+        </a>
         </li>
 
         <li class="padding-top-double"><span class="circle">05</span>&nbsp;&nbsp;&nbsp;Once the device is enrolled,
                                                                      click on <strong>[+]</strong>
                                                                      button to select
                                                                      the sensors.
-            <a href="{{@unit.publicUri}}/images/selectSensorView.png" target="_blank" class="padding-top-double">
+            <a href="{{@unit.publicUri}}/images/selectSensorView.png" target="_blank"
+               class="padding-top-double">
                 <img src="{{@unit.publicUri}}/images/selectSensorView.png" class="img-responsive">
             </a>
         </li>
@@ -189,7 +191,8 @@
                                                                      button
                                                                      to publish sensor readings to
                                                                      IoT server.
-            <a href="{{@unit.publicUri}}/images/publishDataView.png" target="_blank" class="padding-top-double">
+            <a href="{{@unit.publicUri}}/images/publishDataView.png" target="_blank"
+               class="padding-top-double">
                 <img src="{{@unit.publicUri}}/images/publishDataView.png" class="img-responsive">
             </a>
         </li>
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
index e4e3fbb57a..125233c131 100644
--- a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
@@ -15,7 +15,8 @@
 
     <h3 class="uppercase">What it Does</h3>
     <hr>
-    <p class="grey margin-top">Connect Arduino UNO board to WSO2 IoT Server and visualize sensor data.</p>
+    <p class="grey margin-top">Connect Arduino UNO board to WSO2 IoT Server and visualize sensor
+                               data.</p>
     <br>
 
     <h3 class="uppercase">What You Need</h3>
@@ -23,16 +24,21 @@
     <ul class="list-unstyled">
         <li class="padding-top-double"><span class="circle">ITEM 01</span>&nbsp;&nbsp;&nbsp;Arduino UNO Board.
         </li>
-        <li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;Adafruit Wifi Shield for
-            Arduino.
+        <li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;Adafruit
+                                                                          Wifi Shield for
+                                                                          Arduino.
         </li>
-        <li class="padding-top-double"><span class="circle">ITEM 03</span>&nbsp;&nbsp;&nbsp;LED bulb connected to Pin
-            13. <i>(If not available, will use the one on
-                the board.)</i>
+        <li class="padding-top-double"><span class="circle">ITEM 03</span>&nbsp;&nbsp;&nbsp;LED bulb
+                                                                          connected to Pin
+                                                                          13. <i>(If not available,
+                                                                                 will use the one on
+                                                                                 the board.)</i>
         </li>
-        <li class="padding-top-double"><span class="circle">ITEM 04</span>&nbsp;&nbsp;&nbsp;A resister( e.g 330 ohms )
+        <li class="padding-top-double"><span class="circle">ITEM 04</span>&nbsp;&nbsp;&nbsp;A
+                                                                          resister( e.g 330 ohms )
         </li>
-        <li class="padding-top-double"><span class="circle">STEP 05</span>&nbsp;&nbsp;&nbsp;Proceed to [Prepare]
+        <li class="padding-top-double"><span class="circle">STEP 05</span>&nbsp;&nbsp;&nbsp;Proceed
+                                                                          to [Prepare]
             section.
 
     </ul>
@@ -164,31 +170,41 @@
     <h3 class="uppercase">Prepare</h3>
     <hr>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Wifi-Shield mounted onto the Arduino-UNO board
+        <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Wifi-Shield
+                                                                     mounted onto the Arduino-UNO
+                                                                     board
         </li>
-        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Connect LED bulb to arduino as follows
+        <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Connect LED
+                                                                     bulb to arduino as follows
             <br/><br/>
-            <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank" >
+            <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
                 <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive">
             </a>
             <br/>
         </li>
 
-        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Download Arduino-Sketch from
-            [Download] link above.
+        <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Download
+                                                                     Arduino-Sketch from
+                                                                     [Download] link above.
         </li>
-        <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Unzip the downloaded
-            Arduino Agent
+        <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Unzip the
+                                                                     downloaded
+                                                                     Arduino Agent
         </li>
-        <li class="padding-top-double"><span class="circle">05</span>&nbsp;&nbsp;&nbsp;Create a folder called "ArduinoBoardSketch"
-            and move all source files inside
+        <li class="padding-top-double"><span class="circle">05</span>&nbsp;&nbsp;&nbsp;Create a
+                                                                     folder called
+                                                                     "ArduinoBoardSketch"
+                                                                     and move all source files
+                                                                     inside
         </li>
-        <li class="padding-top-double"><span class="circle">06</span>&nbsp;&nbsp;&nbsp;Open ArduinoBoardSketch.h and
-            provide appropriate values for
+        <li class="padding-top-double"><span class="circle">06</span>&nbsp;&nbsp;&nbsp;Open
+                                                                     ArduinoBoardSketch.h and
+                                                                     provide appropriate values for
             <i>[WLAN_SSID]</i>,<i>[WLAN_PASS]</i>,<i>[SERVICE_PORT]</i>,<i>[server]</i> and <i>[deviceIP]</i> variables according to your network.
         </li>
-        <li class="padding-top-double"><span class="circle">07</span>&nbsp;&nbsp;&nbsp;Burn the sketch onto your Arduino
-            board and let the program run.
+        <li class="padding-top-double"><span class="circle">07</span>&nbsp;&nbsp;&nbsp;Burn the
+                                                                     sketch onto your Arduino
+                                                                     board and let the program run.
         </li>
 
         <li class="padding-top-double">
@@ -214,19 +230,27 @@
     <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 padding-double">
         <h3 class="uppercase">Try Out</h3>
         <hr>
-        <p class="grey margin-top">WSO2-IoT Server provides Analytics and Real-Time Statistics of your device</p>
+        <p class="grey margin-top">WSO2-IoT Server provides Analytics and Real-Time Statistics of
+                                   your device</p>
         <ul class="list-unstyled">
-            <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;You can view all your connected
-                devices at <a href="{{@app.context}}/devices">[Device
-                    Management]</a>
-                page.
+            <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;You can
+                                                                         view all your connected
+                                                                         devices at <a
+                        href="{{@app.context}}/devices">[Device
+                                                        Management]</a>
+                                                                         page.
             </li>
-            <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Select one of connected devices and check for available
-                control operations and monitor Real-Time data.
+            <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Select
+                                                                         one of connected devices
+                                                                         and check for available
+                                                                         control operations and
+                                                                         monitor Real-Time data.
             </li>
-            <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;You can also view analytics of
-                the data published to IoT-Server by navigating
-                to Device Analytics page.
+            <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;You can
+                                                                         also view analytics of
+                                                                         the data published to
+                                                                         IoT-Server by navigating
+                                                                         to Device Analytics page.
             </li>
         </ul>
         <br/>
@@ -235,7 +259,8 @@
         <p class="grey margin-top">Click on the image to zoom</p>
         <center>
             <a href="{{@unit.publicUri}}/images/myDevices_analytics.png" target="_blank">
-                <img src="{{@unit.publicUri}}/images/myDevices_analytics.png" class="img-responsive">
+                <img src="{{@unit.publicUri}}/images/myDevices_analytics.png"
+                     class="img-responsive">
             </a>
         </center>
     </div>