fix fuckin merge

gitlabhq
1 parent 88f1f5bb
Showing 1 changed file with 0 additions and 3 deletions Show diff stats
app/views/commits/index.html.haml
@@ -9,10 +9,7 @@
         = select_tag "tag", options_for_select(@project.tags, @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
     = text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url", "one_click_select"]
     .clear
-<<<<<<< HEAD
   - if params[:path]
     %h3{:style => "color:#555"} /#{params[:path]}
-=======
->>>>>>> d3784687943e0bd699d73d82a6bc6cac39689473
   %div{:id => dom_id(@project)}
     = render "commits"
...	...	@@ -9,10 +9,7 @@
9	9	= select_tag "tag", options_for_select(@project.tags, @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Tags"
10	10	= text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url", "one_click_select"]
11	11	.clear
12		-<<<<<<< HEAD
13	12	- if params[:path]
14	13	%h3{:style => "color:#555"} /#{params[:path]}
15		-=======
16		->>>>>>> d3784687943e0bd699d73d82a6bc6cac39689473
17	14	%div{:id => dom_id(@project)}
18	15	= render "commits"
...	...