resolve conflicts keeping our version

Author: rohitbytecode

src/routes/patient.js

@@ -5,21 +5,11 @@ import * as patientController from '../controllers/patient.js';
 const router = express.Router();
 
 
-<<<<<<< HEAD
 router.get('/', protect, authorize('admin', 'doctor','receptionist'), patientController.getPatients);
 
 router.post('/', protect, authorize('admin', 'doctor','receptionist'), patientController.createPatient);
 
 router.put('/:id', protect, authorize('admin', 'doctor','receptionist'), patientController.updatePatient);
-=======
-router.get('/', protect, authorize('admin', 'doctor', 'receptionist'), patientController.getPatients);
-
-router.get('/:id', protect, authorize('admin', 'doctor', 'receptionist'), patientController.getPatientById);
-
-router.post('/', protect, authorize('admin', 'doctor', 'receptionist'), patientController.createPatient);
-
-router.put('/:id', protect, authorize('admin', 'doctor', 'receptionist'), patientController.updatePatient);
->>>>>>> recovery-branch
 
 router.delete('/:id', protect, authorize('admin','receptionist'), patientController.deletePatient);