From 6deba35e10fd64eb5a9f7d53fd7b271eea7da6f9 Mon Sep 17 00:00:00 2001
From: toni <toni@uni-bremen.de>
Date: Wed, 25 Mar 2020 16:03:23 +0000
Subject: [PATCH] small fix

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 5d6f6ae..b665e62 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # collision-detection-frontend
 
 > Webpage for collision detection benchmark server
@@ -20,9 +19,4 @@ npm run build --report
 ```
 
 For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
-=======
-# frontend
 
-Frontend for
-OpenCollBench
->>>>>>> f7140204d51b6bb98a96cc8448521788836b2724
-- 
GitLab