Remove stray code
This commit is contained in:
parent
c2402b91d9
commit
240a1e0427
@ -6,7 +6,6 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>{{ page.title }} - Minetest</title>
|
||||
<link rel="stylesheet" href="/lib/css/bootstrap.min.css">
|
||||
<<<<<<< HEAD
|
||||
<script>
|
||||
Origami.fastclick(document.body); // FastClick
|
||||
$(document).ready(function() {
|
||||
@ -14,9 +13,6 @@
|
||||
$.goup(); // jQuery GoUp
|
||||
});
|
||||
</script>
|
||||
=======
|
||||
<link rel="stylesheet" href="/assets/css/main.css">
|
||||
>>>>>>> 49032e690f88e53d7524c41ca39396a9aced953c
|
||||
|
||||
<link rel="apple-touch-icon" sizes="57x57" href="/media/favicon/57x57.png">
|
||||
<link rel="apple-touch-icon" sizes="60x60" href="/media/favicon/60x60.png">
|
||||
|
Loading…
x
Reference in New Issue
Block a user