From 5af48b9a28b5ce2fd50b96a3ebaba409d5520d8b Mon Sep 17 00:00:00 2001
From: Hermann Blum <hermannsblum@yahoo.de>
Date: Tue, 5 Dec 2017 18:01:24 +0100
Subject: [PATCH] resolve more conflicts
---
src/index.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/index.js b/src/index.js
index 7a5fde1..df09844 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,11 +1,8 @@
import LoginScreen from './login';
import TableView from './views/tableView';
import { UserModal, UserTable, NewUser } from './userTool';
-<<<<<<< HEAD
import { MembershipView } from './membershipTool';
-=======
import { EventTable, NewEvent } from './eventTool';
->>>>>>> Testing small eventTool.
import Sidebar from './sidebar';
import AnnounceTool from './announceTool';
--
GitLab