Fixed conflicts in `projects_helper.rb` and `_clone_panel.html.haml`

app/helpers/projects_helper.rb

@@ -208,15 +208,10 @@ module ProjectsHelper
   end
 
   def default_clone_protocol
-<<<<<<< HEAD
-    if alternative_kerberos_url? && current_user
-      "krb5"
-    elsif !current_user || current_user.require_ssh_key?
-      gitlab_config.protocol
-=======
     if allowed_protocols_present?
       enabled_protocol
->>>>>>> ce/master
+    elsif alternative_kerberos_url? && current_user
+      "krb5"
     else
       if !current_user || current_user.require_ssh_key?
         gitlab_config.protocol

app/views/shared/_clone_panel.html.haml

@@ -2,20 +2,6 @@
 
 .git-clone-holder.input-group
   .input-group-btn
-<<<<<<< HEAD
-    %a#clone-dropdown.clone-dropdown-btn.btn{href: '#', 'data-toggle' => 'dropdown'}
-      %span
-        = default_clone_protocol.upcase
-      = icon('caret-down')
-    %ul.dropdown-menu.dropdown-menu-right.clone-options-dropdown
-      %li
-        = ssh_clone_button(project)
-      %li
-        = http_clone_button(project)
-      - if alternative_kerberos_url?
-        %li
-          = kerberos_clone_button(project)
-=======
     -if allowed_protocols_present?
       .clone-dropdown-btn.btn.btn-static
         %span
@@ -30,7 +16,9 @@
           = ssh_clone_button(project)
         %li
           = http_clone_button(project)
->>>>>>> ce/master
+        - if alternative_kerberos_url?
+          %li
+            = kerberos_clone_button(project)
 
   = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true
   .input-group-btn