Resolve conflicts with app/views/help/index.html.haml

app/views/help/index.html.haml

@@ -6,23 +6,13 @@
   %hr
 
 %h1
-<<<<<<< HEAD
-GitLab
-Enterprise Edition
-- if user_signed_in?
-  %span= Gitlab::VERSION
-  %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ee', Gitlab::REVISION)
-  - if current_application_settings.version_check_enabled
-    = version_status_badge
-=======
   GitLab
-  Community Edition
+  Enterprise Edition
   - if user_signed_in?
     %span= Gitlab::VERSION
-    %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ce', Gitlab::REVISION)
+    %small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ee', Gitlab::REVISION)
     = version_status_badge
   %hr
->>>>>>> upstream/master
 
 - unless current_application_settings.help_page_hide_commercial_content?
   %p.slead