developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Routes conflicts removed

This commit is contained in:
Harry Bomrah 2012-07-19 15:54:04 +08:00
parent 59ab1e6d17
commit 642e0c20ae
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/built_in_modules/gallery/config/routes.rb vendored
View File

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