From 240a1e04273d62f3c461f0d1931bfbba8294d657 Mon Sep 17 00:00:00 2001
From: Calinou <calinou@opmbx.org>
Date: Fri, 25 Sep 2015 16:15:48 +0200
Subject: [PATCH] Remove stray code

---
 _includes/header.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/_includes/header.html b/_includes/header.html
index 8e82ddf..efaef1f 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -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">