Resolve conflict in app/views/admin/dashboard/index.html.haml

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/admin/dashboard/index.html.haml

@@ -126,7 +126,11 @@
               GitLab API
               %span.pull-right
                 = API::API::version
-<<<<<<< HEAD
+            - if Gitlab.config.pages.enabled
+              %p
+                GitLab Pages
+                %span.pull-right
+                  = Gitlab::Pages::VERSION
 
             - if Gitlab::Geo.enabled?
               %p
@@ -137,13 +141,6 @@
                   - else
                     Undefined
 
-=======
-            - if Gitlab.config.pages.enabled
-              %p
-                GitLab Pages
-                %span.pull-right
-                  = Gitlab::Pages::VERSION
->>>>>>> upstream/master
             %p
               Git
               %span.pull-right