Commit 9061653d authored by Clement Ho's avatar Clement Ho

Fix conflict in app/assets/javascripts/ide/components/new_dropdown/modal.vue

parent cca3f97e
...@@ -75,19 +75,6 @@ export default { ...@@ -75,19 +75,6 @@ export default {
@submit.prevent="createEntryInStore" @submit.prevent="createEntryInStore"
class="form-group row append-bottom-0" class="form-group row append-bottom-0"
> >
<<<<<<< HEAD
<label class="label-light col-form-label col-sm-3 ide-new-modal-label">
{{ __('Name') }}
</label>
<div class="col-sm-9">
<input
type="text"
class="form-control"
v-model="entryName"
ref="fieldName"
/>
</div>
=======
<fieldset class="form-group append-bottom-0"> <fieldset class="form-group append-bottom-0">
<label class="label-light col-form-label col-sm-3 ide-new-modal-label"> <label class="label-light col-form-label col-sm-3 ide-new-modal-label">
{{ __('Name') }} {{ __('Name') }}
...@@ -101,7 +88,6 @@ export default { ...@@ -101,7 +88,6 @@ export default {
/> />
</div> </div>
</fieldset> </fieldset>
>>>>>>> gitlab-ce/master
</form> </form>
</deprecated-modal> </deprecated-modal>
</template> </template>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment