install & update

app/views/commits/index.html.haml

@@ -9,7 +9,10 @@
         = 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"