From 367f74eea99c8e46cba7f08efe5fe3e6d3f51179 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 23 Aug 2017 21:00:39 +0200 Subject: merge --- templates/index.liquid | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) (limited to 'templates/index.liquid') diff --git a/templates/index.liquid b/templates/index.liquid index e554ac9..46ed396 100644 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -7,28 +7,14 @@ -<<<<<<< HEAD - -======= ->>>>>>> eddee7c150388106979c16221b3ee106e53b1990
- -======= - -
- ->>>>>>> eddee7c150388106979c16221b3ee106e53b1990
-
{% for entry in entries %} {% unless entry.disabled %}
@@ -38,26 +24,7 @@
{% endunless %} {% endfor %} -<<<<<<< HEAD -
-
- -
- -
- -======= ->>>>>>> eddee7c150388106979c16221b3ee106e53b1990 {% for page in pages %} {% unless page.disabled %} @@ -94,10 +61,9 @@ -- cgit v1.2.3-70-g09d2