From 446aab42d48650fdc56c700cbb5a9dd4073c7b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Fri, 24 Jan 2020 02:43:21 +0100
Subject: [PATCH] git merge error fail

---
 index.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/index.php b/index.php
index 946d483..30ed136 100644
--- a/index.php
+++ b/index.php
@@ -119,11 +119,7 @@ if(!empty($scripts)){
 				<img class="thumb_imglink">
 				<div class="play"></div>
 			</div>
-<<<<<<< HEAD
-			<div class="info">
-=======
 			<div class="info has_thumb">
->>>>>>> master
 				<div class="title"></div>
 				<div class="desc"></div>
 				<div class="host"></div>