From 623c8b361d38039eee811b317b8eea1b6f8405e2 Mon Sep 17 00:00:00 2001
From: Oh Martin <ohrionmartin@gmail.com>
Date: Tue, 27 Oct 2020 00:17:16 +0200
Subject: [PATCH] solved merge conflict

---
 src/components/NavBar.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index a564c4f..2bd4787 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -25,15 +25,9 @@
 
                                         <div class="uk-margin">
                                             <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">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">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 class="uk-margin">