From da0b50f8ec8a310479f646ea250b820f0b88685a Mon Sep 17 00:00:00 2001 From: gitlabhq Date: Fri, 14 Oct 2011 16:42:10 +0300 Subject: [PATCH] fix fuckin merge --- app/views/commits/index.html.haml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/commits/index.html.haml b/app/views/commits/index.html.haml index ea08be4bf83..0e231e4ec2a 100644 --- a/app/views/commits/index.html.haml +++ b/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"