From 2507ab60804f91172a6a8b35f36b5c390804793d Mon Sep 17 00:00:00 2001 From: Yannick Date: Thu, 9 Apr 2020 20:30:37 +0200 Subject: [PATCH] Fix merge issues --- app/views/layouts/application.html.erb | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3ef6a2f..7440d21 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,22 +1,5 @@ -<<<<<<< HEAD - - Tinyform - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - - - - <%= yield %> - - - - -======= Tinyform @@ -76,4 +59,3 @@ ->>>>>>> master