From 7d4dc9b63d6d5b370f4c6a444243de8f8691bb79 Mon Sep 17 00:00:00 2001
From: Mustafa Yontar <mustafa@oyd.org.tr>
Date: Sat, 11 Apr 2020 01:03:45 +0300
Subject: [PATCH] merge conflict

---
 src/lib/RemoteFeed.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib/RemoteFeed.vue b/src/lib/RemoteFeed.vue
index 5632990..774e66b 100644
--- a/src/lib/RemoteFeed.vue
+++ b/src/lib/RemoteFeed.vue
@@ -1,12 +1,10 @@
 <template>
-    <div class="vid_main" @mouseleave="showaction = false"    @mouseover="showaction = true"
-    >
+    <div class="vid_main" @mouseleave="showaction = false"    @mouseover="showaction = true">
         <video ref="feed_video" width="100%" height="100%" autoplay playsinline/>
         <div class="info">{{ bitrate }}</div>
         <div class="infoSlow">Slow Connection</div>
-        <div class="actions"  v-show="showaction">
         <div class="infoName">{{ remoteStream.display }}</div>
-        <div class="actions">
+        <div class="actions" v-show="showaction">
             <v-slider
                     v-model="volume"
                     :min="0"