Revert "Merged pull request octocat#9."

This reverts commit bdd3996, reversing changes made to fd0a1b2.
huandaolu · Aug 13, 2013 · c026be7 · c026be7
1 parent 83c2cf5
commit c026be7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -1,10 +1,14 @@
-<!DOCTYPE html>
+<!DOCTYPE HTML>
 
 <html>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
+<<<<<<< HEAD
+  <title>untitled</title>
+=======
   <title>Untitled</title>
+>>>>>>> parent of bdd3996... Merged pull request #9.
   <style type="text/css">
     * {
       margin:0px;
@@ -18,7 +22,7 @@
     }
 
     p {
-      display: block;
+      display:block;
       width: 400px;
       margin: 50px auto;
       font: 30px Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
@@ -29,7 +33,7 @@
 
 <body>
 
-<img src="forkit.gif" id="octocat" alt="" />
+<img src="forkit.gif" width="384" height="236" id="octocat" alt="" />
 
 <p>
   Fork me? No, fork you!