Commit f9c0363b authored by Clement Ho's avatar Clement Ho

Fix conflict in app/views/projects/pipeline_schedules/_form.html.haml

parent 83e0c7a8
<<<<<<< HEAD
= form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: " js-pipeline-schedule-form" } do |f|
=======
= form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: "js-pipeline-schedule-form" } do |f|
>>>>>>> gitlab-ce/master
= form_errors(@schedule)
.form-group.row
.col-md-9
......
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