From 2b92efcf28b57c1b3015a8e782a124dce36dd8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Thu, 7 Oct 2021 14:53:49 +0200
Subject: [PATCH] Fix text left from merge conflict in Dropdown
---
src/components/Dropdown.vue | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index 760ebb03..b63ebe80 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -12,24 +12,14 @@
v-if="search"
v-model="input"
v-on:keyup.enter="select(0)"
-<<<<<<< HEAD
v-on:keyup.esc="toggleDropdown(false)"
-=======
- @input="handelInput"
->>>>>>> develop
class="search"
autocomplete="off"
tabindex="0"
:placeholder="placehold"
-<<<<<<< HEAD
ref="input"
/>
<div v-if="!input" class="default text">{{ selected }}</div>
-=======
- />
- <!-- {{placeholder}} -->
- <div v-if="!input" class="default text">{{ selected || placeholder }}</div>
->>>>>>> develop
<i
:class="['dropdown icon', { clear: clearable && selected }]"
@click="clear"
--
GitLab