From a06216b6ad8ebaace4b9652974a9e866ab1372fe Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@tu-dortmund.de>
Date: Mon, 13 Jun 2022 12:19:33 +0200
Subject: [PATCH] clean-up

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e9cccb63..2c27e924a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,8 @@
 **/*~
 **/*.bak
 build/
-<<<<<<< HEAD
-=======
 install/
 .vscode/
->>>>>>> ignore vscode - step1
 Framework/Particles/GeneratedParticleProperties.inc
 flymd.html
 flymd.md
-- 
GitLab