Fix conflicts

notlion · notlion · commit 479263e634e6 · 2012-06-17T23:31:53.000-07:00
diff --git a/static/toy/pop.html b/static/toy/pop.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="viewport" content="initial-scale=1.0, user-scalable=no"/>
-    <link href="../css/toy.css" media="all" rel="stylesheet" type="text/css"/>
+  <meta name="viewport" content="initial-scale=1.0, user-scalable=no"/>
+  <link href="../css/toy.css" media="all" rel="stylesheet" type="text/css"/>
 </head>
 <body class="popped">
-    <div id="code" class="popped">
-        <textarea id="code-text" spellcheck="false">
-        </textarea>
-    </div>
+  <div id="code" class="popped">
+    <textarea id="code-text" spellcheck="false">
+    </textarea>
+  </div>
 </body>
 </html>
