Remove strange captions

This commit is contained in:
Dm1tr1y147 2019-06-22 22:35:51 +05:00 committed by GitHub
parent b0884348b7
commit 69605abffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
$(function() { $(function() {
var title = document.title; var title = document.title;
$(window).scroll(function() { $(window).scroll(function() {
@ -37,7 +36,6 @@ $("main img").click(function () {
}); });
}); });
}); });
=======
var mywindow = $(window); var mywindow = $(window);
var mypos = mywindow.scrollTop(); var mypos = mywindow.scrollTop();
var up = false; var up = false;
@ -79,4 +77,3 @@ $("main img").click(function () {
}, 800); }, 800);
}); });
}); });
>>>>>>> c27a4029688d84a604259109737c953b92088855