CE->EE: Resolve a missed conflict in app/models/project_wiki.rb

app/models/project_wiki.rb

@@ -52,14 +52,11 @@ class ProjectWiki
 
   def http_url_to_repo
     "#{Gitlab.config.gitlab.url}/#{full_path}.git"
-<<<<<<< HEAD
   end
 
   # No need to have a Kerberos Web url. Kerberos URL will be used only to clone
   def kerberos_url_to_repo
     [Gitlab.config.build_gitlab_kerberos_url, '/', full_path, '.git'].join('')
-=======
->>>>>>> ce/master
   end
 
   def wiki_base_path