chore: remove errant merge string

7 months ago · 27100bb090
parent a1f0373553
commit 27100bb090
1 changed files with 0 additions and 1 deletions
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@ -1,5 +1,4 @@
 <footer class="d-flex justify-content-center">
-<<<<<<< HEAD
  <p class="footer-item">Copyright © 2025</p>
  <%= link_to "Lowell" , "https://www.lowell.k12.ma.us/" , class: "footer-item footer-link", target: "_blank" %>
 </footer>