fix fuckin merge

This commit is contained in:
gitlabhq 2011-10-14 16:42:10 +03:00
parent 88f1f5bba6
commit da0b50f8ec

View file

@ -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"