From 642e0c20aeb5251db40b0f6a131d7b9451120e0c Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harminder_bomrah@yahoo.co.in>
Date: Thu, 19 Jul 2012 15:54:04 +0800
Subject: [PATCH] Routes conflicts removed

---
 vendor/built_in_modules/gallery/config/routes.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vendor/built_in_modules/gallery/config/routes.rb b/vendor/built_in_modules/gallery/config/routes.rb
index 9b221060..ae516d3f 100644
--- 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