diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-10-14 17:42:10 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-10-14 17:42:10 +0400 |
| commit | 7860b95ef581c787bda9dc6a1dab1b4acc33f1bb (patch) | |
| tree | f97aeb8b94ae78d259ae53f4cca8495521e1f688 /app | |
| parent | 48823f778ab05a1509bfe8c998d2c97ed344a3f3 (diff) | |
fix fuckin merge
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/commits/index.html.haml | 3 |
1 files changed, 0 insertions, 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" |