Resolve merge conflicts

seitsu · Jan 2, 2016 · 9e60b8d · 9e60b8d
2 parents 6fa7fef + d2d7434
commit 9e60b8d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -48,4 +48,4 @@
       </a>
       {% endif %}
 
-</div>
+</div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -51,4 +51,4 @@
 <!-- TFA JS -->
 <script src="/js/app.js"></script>
 </body>
-</html>
+</html>
diff --git a/index.html b/index.html
@@ -202,4 +202,4 @@ <h5 class="ui icon header">
       {% include table.html variable-param=site.data.sections.retail %}
     </div>
   </div>
-</div>
+</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,4 +48,4 @@ @@
           </a>
           {% endif %}
-    </div>
+    </div>