Routes conflicts removed

vendor/built_in_modules/gallery/config/routes.rb

@@ -1,6 +1,4 @@
 Rails.application.routes.draw do
-<<<<<<< HEAD
-=======
 	namespace :panel do
 	  namespace :gallery do
 	      namespace :back_end do
@@ -10,5 +8,4 @@ Rails.application.routes.draw do
 	      end
 	  	end
 	end
->>>>>>> gallery_orbit
 end