Moved some files around

2025-10-29 18:00:23 +00:00 · 2014-10-16 19:09:50 +02:00
parent 07ff14389c
commit 0a8a5af446
7 changed files with 7 additions and 0 deletions
--- a/static/favicon.ico
+++ b/static/favicon.ico
--- a/static/css/settings.png
+++ b/static/css/settings.png
--- a/static/css/skip.png
+++ b/static/css/skip.png
--- a/static/css/style.css
+++ b/static/css/style.css
--- a/static/favicon.png
+++ b/static/favicon.png
--- a/static/images/logo.png
+++ b/static/images/logo.png
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -1,6 +1,13 @@
 <title>Zöff</title>
+<<<<<<< HEAD
 <meta name="author" content="Nicolas 'Nixo' Almagro Tonne &amp; Kasper 'KasperRT' Rynning-Tønnesen">
 <link rel="stylesheet" type="text/css" href="/static/style.css" title="Default" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="icon" type="image/png" href="/static/favicon.png"/>
+=======
+<meta name="author" content="Nicolas 'Nixo' Almagro Tonne &amp; Kasper 'KasperRT' Rynning-Tønnesen" />
+<link rel="stylesheet" type="text/css" href="static/css/style.css" title="Default" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="icon" type="image/png" href="favicon.png"/>
+>>>>>>> Moved some files around
 <link href='http://fonts.googleapis.com/css?family=Open+Sans:300' rel='stylesheet' type='text/css'>