Remove strange captions
This commit is contained in:
parent
b0884348b7
commit
69605abffa
3
main.js
3
main.js
@ -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
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user