From d8365d3a4f782e1ed29271725a19c0327cbcd8da Mon Sep 17 00:00:00 2001
From: Erling Aaby <erlinaa@stud.hist.no>
Date: Thu, 25 Apr 2013 14:59:50 +0200
Subject: Removed animation showcase, added img instead, added colors to lower
 sections

---
 views/header.ejs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'views/header.ejs')

diff --git a/views/header.ejs b/views/header.ejs
index f0185cb..2b3dbe6 100644
--- a/views/header.ejs
+++ b/views/header.ejs
@@ -12,4 +12,5 @@
     <link rel="stylesheet" href="/css/bootstrap.css" />
     <link rel="stylesheet" href="/css/bootstrap-responsive.css">
     <link rel="stylesheet" href="/css/styles.css" />
+	<link rel="stylesheet" href="/css/use.css" />
 
-- 
cgit v1.2.3


From bfc56f2cc5c0c2b3d4e19fd230b52af91ca97781 Mon Sep 17 00:00:00 2001
From: robertkj <joramo40@hotmail.com>
Date: Fri, 26 Apr 2013 09:16:03 +0200
Subject: fixed bug

---
 views/header.ejs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'views/header.ejs')

diff --git a/views/header.ejs b/views/header.ejs
index 74afad9..815be5c 100644
--- a/views/header.ejs
+++ b/views/header.ejs
@@ -11,10 +11,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" href="/css/bootstrap.css" />
     <link rel="stylesheet" href="/css/bootstrap-responsive.css">
-<<<<<<< HEAD
-    <link rel="stylesheet" href="/css/styles.css" />
-	<link rel="stylesheet" href="/css/use.css" />
-=======
+
     <link rel="stylesheet" href="/css/shame.css" />
->>>>>>> 44b7b0b25befea64ab85d7da8eb93aa905c76e08
 
-- 
cgit v1.2.3