From c3c4ecf0fde40502250ef465b2ae6cc804937564 Mon Sep 17 00:00:00 2001
From: Adam Mohammed <adam@fixergrid.net>
Date: Sat, 23 Nov 2024 19:34:00 -0500
Subject: [PATCH] woops

---
 app/views/layouts/application.html.erb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index d1211a4..d431e9d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,15 +9,9 @@
 
     <%= yield :head %>
 
-<<<<<<< Updated upstream
     <link rel="manifest" nhref="/manifest.json">
     <link rel="icon" href="<%= image_path '/icon.png' %>" type="image/png">
     <link rel="apple-touch-icon" href="<%= image_path '/icon.png' %>">
-=======
-    <link rel="manifest" href="/manifest.json">
-    <link rel="icon" href="<%= image_path 'icon.png' %>" type="image/png">
-    <link rel="apple-touch-icon" href="<%= image_path 'icon.png' %>">
->>>>>>> Stashed changes
 
     <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %>