From 9e366fdc1744c2fc96cd8f67efd577f9fdaa97e2 Mon Sep 17 00:00:00 2001
From: catarak <ctarakajian@gmail.com>
Date: Mon, 13 Jun 2016 16:25:56 -0400
Subject: [PATCH] fix merge conflict, for real this time

---
 server/server.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/server.js b/server/server.js
index 0d7eccce..9beb631c 100644
--- a/server/server.js
+++ b/server/server.js
@@ -49,8 +49,6 @@ mongoose.connection.on('error', () => {
   process.exit(1);
 });
 
-const passportConfig = require('./config/passport');
-
 app.get("/", function(req, res) {
   res.sendFile(path.resolve(__dirname + '/../index.html'));
 })