conflict fix

bodil · Sep 4, 2012 · 1feca8d · 1feca8d
2 parents e2ef53f + 6b3fdf9
commit 1feca8d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/views/index.ejs b/views/index.ejs
@@ -1,13 +1,14 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>My Awesome Todo List blah</title>
+
+    <title>My marquee infested Todo List</title>
+
     <link rel="stylesheet" href="screen.css">
   </head>
   <body>
     <h1>
-
-
+
 	<marquee scrollamount="15" direction="up" behavior="alternate"><marquee scrollamount="15" direction="right" behavior="alternate">
 	<marquee scrollamount="15" direction="left" behavior="alternate"><marquee scrollamount="15" direction="right" behavior="alternate">
 		<img src="hellocthulhu-right.png">