From 7d465ca489f9c917e21ddaba0b363b6277c6d6cc Mon Sep 17 00:00:00 2001
From: Rahul <rahul@Railsfactorys-MacBook-Pro.local>
Date: Thu, 12 Mar 2020 00:00:56 +0530
Subject: [PATCH] Fixed conflicts

---
 lang/en-US.js      |  1 +
 pages/realtime.vue | 21 +++++++++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lang/en-US.js b/lang/en-US.js
index 745b0c41f..c5d6b93e1 100644
--- a/lang/en-US.js
+++ b/lang/en-US.js
@@ -276,6 +276,7 @@ export default {
   notes: "Notes",
   socketio: "Socket.IO",
   event_name: "Event Name",
+  mqtt: "MQTT",
   mqtt_topic: "Topic",
   mqtt_topic_title: "Publish / Subscribe topic",
   mqtt_publish: "Publish",
diff --git a/pages/realtime.vue b/pages/realtime.vue
index 7fd9c3ac6..0185976e7 100644
--- a/pages/realtime.vue
+++ b/pages/realtime.vue
@@ -27,7 +27,9 @@
                   >
                     {{ !connectionState ? $t("connect") : $t("disconnect") }}
                     <span>
-                      <i class="material-icons">{{ !connectionState ? "sync" : "sync_disabled" }}</i>
+                      <i class="material-icons">{{
+                        !connectionState ? "sync" : "sync_disabled"
+                      }}</i>
                     </span>
                   </button>
                 </li>
@@ -92,7 +94,9 @@
                   >
                     {{ !connectionSSEState ? $t("start") : $t("stop") }}
                     <span>
-                      <i class="material-icons">{{ !connectionSSEState ? "sync" : "sync_disabled" }}</i>
+                      <i class="material-icons">{{
+                        !connectionSSEState ? "sync" : "sync_disabled"
+                      }}</i>
                     </span>
                   </button>
                 </li>
@@ -113,17 +117,10 @@
         <tab :id="'socketio'" :label="$t('socketio')">
           <socketio />
         </tab>
+        <tab :id="'mqtt'" :label="$t('mqtt')">
+          <mqtt />
+        </tab>
       </tabs>
-      <input id="tab-three" type="radio" name="options" />
-      <label for="tab-three">{{ $t("socketio") }}</label>
-      <div class="tab">
-        <socketio />
-      </div>
-      <input id="tab-four" type="radio" name="options" />
-      <label for="tab-four">{{ $t("mqtt") }}</label>
-      <div class="tab">
-        <mqtt />
-      </div>
     </section>
   </div>
 </template>