beenull/m1k1oblog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git merge error fail

Browse source
This commit is contained in:
Miroslav Šedivý 2020-01-24 02:43:21 +01:00
parent ee9506ac59
commit 446aab42d4
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.php
View file

@ -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>