fix style import conflict
This commit is contained in:
parent
1ae1957a58
commit
3f855f3883
|
@ -11,8 +11,6 @@
|
||||||
|
|
||||||
@import "components/footer";
|
@import "components/footer";
|
||||||
|
|
||||||
<<<<<<< HEAD
|
@import "components/user-guide";
|
||||||
|
|
||||||
@import "components/verse";
|
@import "components/verse";
|
||||||
=======
|
|
||||||
@import "components/user-guide"
|
|
||||||
>>>>>>> master
|
|
||||||
|
|
Loading…
Reference in New Issue