fix style import conflict

2021-05-25 18:30:34 -05:00 · 2021-05-25 18:30:34 -05:00 · 3f855f3883
parent 1ae1957a58
commit 3f855f3883
1 changed files with 3 additions and 5 deletions
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@ -11,8 +11,6 @@

@import "components/footer";

-<<<<<<< HEAD
-@import "components/verse";
-=======
-@import "components/user-guide"
->>>>>>> master
+@import "components/user-guide";
+
+@import "components/verse";