edit: merge conflict solved

2026-04-21 02:00:22 +02:00
parent 1ec359f546
commit c346673bd9
1 changed files with 0 additions and 4 deletions
@@ -21,12 +21,8 @@
        </button>
      </div>
      <div class="windowContent" id="visualizerContent">
-<<<<<<< HEAD
        <video controls id="displayedImgStyle" :src="selectedVideo.src" :type="selectedVideo.format">
        </video>
-=======
-        <video controls id="displayedImgStyle" :src="selectedVideo.src"></video>
->>>>>>> 13df9c06016b4c751d7817b8f3b1108bf669a990
        <div class="reactBar">
          <p class="reactStatStyle">{{selectedVideo.like}}</p>
          <button data-tooltip="j'aime bien" type="button" class="iconBtnStyle" :class="{reactedStyle: selectedVideo.isLiked}" @mousedown.capture="likeImg" @touchstart.capture="likeImg">