Removing Conflict markers

app/views/projects/edit.html.haml

@@ -49,8 +49,6 @@
           = f.label :tag_list, "Tags", class: 'label-light'
           = f.text_field :tag_list, value: @project.tag_list.sort.join(', '), maxlength: 2000, class: "form-control"
           %p.help-block Separate tags with commas.
-<<<<<<< master
-=======
         %hr
         %fieldset
           %h5.prepend-top-0
@@ -156,7 +154,6 @@
           = render 'shared/promotions/promote_servicedesk'
         %hr
         %fieldset.features.append-bottom-default
->>>>>>> Showing now Variables for Tests
           %h5.prepend-top-0
             Project avatar
           .form-group