Commit 7860b95e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

fix fuckin merge

parent 48823f77
...@@ -9,10 +9,7 @@ ...@@ -9,10 +9,7 @@
= select_tag "tag", options_for_select(@project.tags, @branch), :onchange => "this.form.submit();", :class => "", :prompt => "Tags" = 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"] = text_field_tag "ssh", @project.url_to_repo, :class => ["ssh_project_url", "one_click_select"]
.clear .clear
<<<<<<< HEAD
- if params[:path] - if params[:path]
%h3{:style => "color:#555"} /#{params[:path]} %h3{:style => "color:#555"} /#{params[:path]}
=======
>>>>>>> d3784687943e0bd699d73d82a6bc6cac39689473
%div{:id => dom_id(@project)} %div{:id => dom_id(@project)}
= render "commits" = render "commits"
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