fix merge

omega · Jul 28, 2012 · ae522fc · ae522fc
1 parent 97491b1
commit ae522fc
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/root/wrapper.html b/root/wrapper.html
@@ -49,7 +49,6 @@
   </script>
 </head>
 <body>
-<<<<<<< HEAD
     <div class="navbar">
         <div class="navbar-inner">
             <div class="container-fluid">