getBible/app
4
2
Fork 0
mirror of https://github.com/getbible/app.git synced 2024-06-02 02:40:47 +00:00
Code

solved merge conflict

Browse Source
This commit is contained in:
Oh 2020-10-27 00:17:16 +02:00
parent e814ade96c
commit 623c8b361d
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/NavBar.vue
View File

@ -25,15 +25,9 @@
<div class="uk-margin"> <div class="uk-margin">
<div class="uk-button-group"> <div class="uk-button-group">
<<<<<<< HEAD
<button class="uk-button uk-button-default uk-button-small">ALL WORDS</button> <button class="uk-button uk-button-default uk-button-small">ALL WORDS</button>
<button class="uk-button uk-button-default uk-button-small">ANY WORDS</button> <button class="uk-button uk-button-default uk-button-small">ANY WORDS</button>
<button class="uk-button uk-button-default uk-button-small">PHRASE</button> <button class="uk-button uk-button-default uk-button-small">PHRASE</button>
=======
<button class="uk-button uk-button-default uk-button-small">All</button>
<button class="uk-button uk-button-default uk-button-small">Any</button>
<button class="uk-button uk-button-default uk-button-small">Phrase</button>
>>>>>>> e59f24b414f547443bab3d9f17b2a4df4d12cfdb
</div> </div>
</div> </div>
<div class="uk-margin"> <div class="uk-margin">