diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2017-08-23 21:00:39 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2017-08-23 21:00:39 +0200 |
| commit | 367f74eea99c8e46cba7f08efe5fe3e6d3f51179 (patch) | |
| tree | 0c799532bcc953a6d5f1ec6f2e5b247eb81cf668 /templates/index.liquid | |
| parent | 0e494854248bb5b76839fa9c73b07f5e864248a4 (diff) | |
merge
Diffstat (limited to 'templates/index.liquid')
| -rw-r--r-- | templates/index.liquid | 36 |
1 files changed, 1 insertions, 35 deletions
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> <body> -<<<<<<< HEAD - -======= ->>>>>>> eddee7c150388106979c16221b3ee106e53b1990 <div id='header'> - <center> <h1>How to make a Folkestone.</h1> <a href="https://docs.google.com/forms/d/10dqrK_3UZW_xlPWQLERd0xTwVONryyicNuz2aYz3X_I/edit?c=0&w=1"><h2>Participate!</h2></a> <div id='tags'></div> -<<<<<<< HEAD - </center> </div> <br> - -======= -</div> -<br> - ->>>>>>> eddee7c150388106979c16221b3ee106e53b1990 <div id='body'> - <center> {% for entry in entries %} {% unless entry.disabled %} <div class='cell' data-id='{{ entry.id }}'> @@ -38,26 +24,7 @@ </div> {% endunless %} {% endfor %} -<<<<<<< HEAD - </center> -</div> - -<center> -<div id='footer'> - - <div class='cell' data-id='{{ testimonial.id }}'> - </div> - <div class='cell' data-id='{{ developer.id }}'> - </div> - <a href="http://howtomakeafolkestone.life/acknowledgements"> - Acknowledgements</a> - -</div> -</center> - -======= </div> ->>>>>>> eddee7c150388106979c16221b3ee106e53b1990 {% for page in pages %} {% unless page.disabled %} @@ -94,10 +61,9 @@ <div id="footer"> How to make a Folkestone.<br> - Tokyo University of the Arts<br> Central Saint Martins - + <a href="http://howtomakeafolkestone.life/acknowledgements">Acknowledgements</a> </div> </body> |