bumi/tinyforms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge issues

Browse Source
This commit is contained in:
Yannick 2020-04-09 20:30:37 +02:00
parent 5eff2042b3
commit 2507ab6080
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/views/layouts/application.html.erb
View File

@ -1,22 +1,5 @@
<!DOCTYPE html>
<html>
<<<<<<< HEAD
<head>
<title>Tinyform</title>
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>
<body>
<%= yield %>
<script src="https://kit.fontawesome.com/221ac0e2fd.js" crossorigin="anonymous"></script>
</body>
</html>
=======
<head>
<title>Tinyform</title>
@ -76,4 +59,3 @@
</body>
</html>
>>>>>>> master