Routes conflicts removed

2012-07-19 15:54:04 +08:00 · 2012-07-19 15:54:04 +08:00 · 642e0c20ae
parent 59ab1e6d17
commit 642e0c20ae
1 changed files with 0 additions and 3 deletions
--- a/vendor/built_in_modules/gallery/config/routes.rb
+++ b/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