Permalink
Browse files

fix merge

  • Loading branch information...
1 parent 97491b1 commit ae522fcdb5a63177b2df374132b7c9316d8c6342 @monken monken committed Jul 28, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 root/wrapper.html
View
1 root/wrapper.html
@@ -49,7 +49,6 @@
</script>
</head>
<body>
-<<<<<<< HEAD
<div class="navbar">
<div class="navbar-inner">
<div class="container-fluid">

0 comments on commit ae522fc

Please sign in to comment.