Resolved merge conflicts

David Brady · David Brady · commit 2945c48e3f9a · 2011-05-10T09:35:13.000-06:00
diff --git a/_layouts/recipe.html b/_layouts/recipe.html
@@ -5,7 +5,7 @@
     <link rel="stylesheet" href="/css/default.css" type="text/css">
   </head>
   <body>
-    <header>
+   <header>
       <h1>
         <a href="/">CoffeeScript Cookbook</a> &raquo;
         <a href="/chapters/{{ page.chapter | downcase }}">{{ page.chapter }}</a> &raquo;
@@ -23,6 +23,6 @@ <h1>
       <p>Is this recipe wrong, incomplete, or non idiomatic? Help fix it by reading the <a href="/contributing">Contributor's Guide</a>!</p>
       <a href="/license"><img src="/images/cc_by_badge.png" /></a>
     </footer>
-  </body>
+ </body>
 </html>
 
