Commit 8442c5f3 authored by Clement Ho's avatar Clement Ho

Fix conflict in app/views/groups/milestones/_form.html.haml

parent 88c634be
......@@ -4,19 +4,11 @@
.col-md-6
.form-group.row
<<<<<<< HEAD
= f.label :title, "Title", class: "col-form-label"
.col-sm-10
= f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true
.form-group.row.milestone-description
= f.label :description, "Description", class: "col-form-label"
=======
= f.label :title, "Title", class: "col-form-label col-sm-2"
.col-sm-10
= f.text_field :title, maxlength: 255, class: "form-control", required: true, autofocus: true
.form-group.row.milestone-description
= f.label :description, "Description", class: "col-form-label col-sm-2"
>>>>>>> gitlab-ce/master
.col-sm-10
= render layout: 'projects/md_preview', locals: { url: group_preview_markdown_path } do
= render 'projects/zen', f: f, attr: :description, classes: 'note-textarea', placeholder: 'Write milestone description...', supports_autocomplete: false
......
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