remove remnants from merge conflict!

LibreCat · Jun 20, 2018 · ade7e79 · ade7e79
1 parent a292ef6
commit ade7e79
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/views/admin/account.tt b/views/admin/account.tt
@@ -72,9 +72,5 @@
 
 </div><!-- outer row -->
 <!-- END admin/account.tt -->
-<<<<<<< HEAD
 
 [% INCLUDE footer.tt %]
-=======
-[% INCLUDE footer.tt %]
->>>>>>> dev