minetest-gitlab/minetest.github.io
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove stray code

Browse Source
This commit is contained in:
Calinou 2015-09-25 16:15:48 +02:00
parent c2402b91d9
commit 240a1e0427
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_includes/header.html
View File

@ -6,7 +6,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ page.title }} - Minetest</title> <title>{{ page.title }} - Minetest</title>
<link rel="stylesheet" href="/lib/css/bootstrap.min.css"> <link rel="stylesheet" href="/lib/css/bootstrap.min.css">
<<<<<<< HEAD
<script> <script>
Origami.fastclick(document.body); // FastClick Origami.fastclick(document.body); // FastClick
$(document).ready(function() { $(document).ready(function() {
@ -14,9 +13,6 @@
$.goup(); // jQuery GoUp $.goup(); // jQuery GoUp
}); });
</script> </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="57x57" href="/media/favicon/57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/media/favicon/60x60.png"> <link rel="apple-touch-icon" sizes="60x60" href="/media/favicon/60x60.png">