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