From 4d68206dff9180dfc1a278ebee6600806b2b548f Mon Sep 17 00:00:00 2001
From: ManifoldFR <wilson.jallet@gmail.com>
Date: Wed, 28 Feb 2018 15:46:52 +0100
Subject: [PATCH] Removed useless imports
---
src/index.js | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/index.js b/src/index.js
index 5111bc5..2d73129 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,13 +3,7 @@
*/
import server from './server';
import colors from 'colors';
-<<<<<<< HEAD
import setupLdapAuth from './ldap/ldap_auth.js';
-=======
-import { graphqlExpress, graphiqlExpress } from 'graphql-server-express';
-import makeExecutableSchema from 'graphql-tools';
-import setupLdapAuth from './ldap/ldap_auth';
->>>>>>> ae873fe15e2b7ad99437bcd23a8dd5e6263b6683
import router from './admin_view/admin_router';
// setting up ldap authentication
--
GitLab