Fix conflict for lib/api/namespaces.rb

e24a5b05 · Rubén Dávila · cba751f2 · e24a5b05
Commit e24a5b05 authored Dec 08, 2018 by Rubén Dávila
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/api/namespaces.rb lib/api/namespaces.rb +0 -3

No files found.
--- a/lib/api/namespaces.rb
+++ b/lib/api/namespaces.rb
@@ -17,11 +17,8 @@ module API
      end
    end
-<<<<<<< HEAD
    prepend EE::API::Namespaces
-=======
->>>>>>> upstream/master
    resource :namespaces do
      desc 'Get a namespaces list' do
        success Entities::Namespace