fix conflicts in config/application.rb

a8158c9f · Mike Greiling · 67c7596c · a8158c9f
Commit a8158c9f authored Jul 08, 2017 by Mike Greiling
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

config/application.rb config/application.rb +0 -3

No files found.
--- a/config/application.rb
+++ b/config/application.rb
@@ -29,10 +29,7 @@ module Gitlab
                                     #{config.root}/app/models/project_services
                                     #{config.root}/app/workers/concerns
                                     #{config.root}/app/services/concerns
-<<<<<<< HEAD
                                     #{config.root}/app/uploaders/concerns
-=======
->>>>>>> master-ce
                                     #{config.root}/app/finders/concerns))

    config.generators.templates.push("#{config.root}/generator_templates")