Resolve config/routes/user.rb

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

config/routes/user.rb

@@ -61,16 +61,13 @@ scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) d
     get :contributed, as: :contributed_projects
     get :snippets
     get :exists
-<<<<<<< HEAD
-    get :pipelines_quota
-=======
->>>>>>> upstream/master
     get :activity
     get '/', to: redirect('%{username}'), as: nil
 
-    ## EE-specific
+    ## EE-specific START
     get :available_templates, format: :js
-    ## EE-specific
+    get :pipelines_quota
+    ## EE-specific END
   end
 
   # Compatibility with old routing