Skip to content
Snippets Groups Projects
Commit 2b92efcf authored by Timothee P's avatar Timothee P :sunflower:
Browse files

Fix text left from merge conflict in Dropdown

parent dbb1382d
No related branches found
No related tags found
Loading
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment