From ba1cf0c6446a22ebcd9bc9a08d782408f94c01bf Mon Sep 17 00:00:00 2001
From: catarak <ctarakajian@gmail.com>
Date: Wed, 18 May 2016 13:37:59 -0400
Subject: [PATCH] add react router

---
 server/routes/session.routes.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/routes/session.routes.js b/server/routes/session.routes.js
index 6cca9a93..89d15097 100644
--- a/server/routes/session.routes.js
+++ b/server/routes/session.routes.js
@@ -1,7 +1,10 @@
 import { Router } from 'express';
 import * as SessionController from '../controllers/session.controller';
 import passport from 'passport';
+<<<<<<< HEAD
 
+=======
+>>>>>>> add react router
 const router = new Router();
 
 router.route('/login').get(SessionController.newSession);
@@ -10,4 +13,8 @@ router.route('/login').post(SessionController.createSession);
 
 router.route('/logout').get(SessionController.destroySession);
 
+<<<<<<< HEAD
 //TODO add github authentication stuff
+=======
+//TODO add github authentication stuff
+>>>>>>> add react router