merge

rcino · Jan 19, 2014 · f5c51f6 · f5c51f6
2 parents 23f4cfc + 13a7042
commit f5c51f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/index.html b/index.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <html>
 <head>
   <title>Patchwork: Git, GitHub and the Pursuit of Open Source</title>
@@ -42,3 +43,13 @@ <h5>What's this all about? Join the list, complete the Git-it workshop.</h5>
  </div>
 <body>
 </html>
+=======
+
+<p>Welcome! jlord at 2014-01-17T02:35:52Z</p>
+
+
+<p>EVERYONE! jlord at 2014-01-17T02:35:52Z</p>
+
+<p>EVERYONE! maxogden at 2014-01-14T09:04:52Z</p>
+
+>>>>>>> 13a7042e8aefb61116bfaa9f14f4cf5177b6c524
diff --git a/style.css b/style.css
@@ -35,10 +35,6 @@ ul.nav {list-style: none; padding: 0px; margin: 0px;}
 .compatriots-list {list-style: none; padding: 0px; font-size: 12px;}
 .compatriots-list li {padding: 2px 0px;}
 
-
-
-
-
 .userdate {font-family: "Andale Mono"}
 .userdetail {font-weight: bold;}