Merge branch 'Fix-merge-conflict' into 'develop'

Fix text left from merge conflict in Dropdown

See merge request !85

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"