fix conflicts

2019-05-06 08:30:56 -05:00
parent 65f8271032 af15618b57
commit 4b78ba61ea
12 changed files with 44 additions and 10 deletions
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -1,4 +1,3 @@
-
 // Fonts
@import url('https://fonts.googleapis.com/css?family=Nunito');