From ad1efd40a9301ea63096f98d856744a84199cb54 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Fri, 26 Jul 2019 16:57:13 +0200
Subject: [PATCH] .

---
 modules/events/venue.routes.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/events/venue.routes.js b/modules/events/venue.routes.js
index 05d5c63..0a364ec 100644
--- a/modules/events/venue.routes.js
+++ b/modules/events/venue.routes.js
@@ -15,7 +15,6 @@ routes.get('/venues',
     venueController.find({})
 );
 
-<<<<<<< HEAD
 routes.get('/venues', 
     //SortMiddleware.middleware({ default: "name" }), 
     venueController.find()    
@@ -34,10 +33,6 @@ routes.get('/venues/:id/events',
     },
     venueController.find());
 
-=======
-//routes.get('/venues', isLoggedUser, SortMiddleware.middleware({ default: "name" }), venueController.find);
-//routes.get('/venues/:id', isLoggedUser, venueController.findOne);
->>>>>>> 19bd691ce0c9520deed4151d3252735a652b53c7
 
 routes.post('/venues/', SchemaValidator(VenueValidation.VenueInputType, true), venueController.create);
 //routes.put('/venues/:id', isAdministratorUser, venueController.update);