From b85d7e61f0c7f2db0ffac6c408cf66a78b16150a Mon Sep 17 00:00:00 2001
From: Niko <nikolaus.feith@unileoben.ac.at>
Date: Mon, 4 Mar 2024 11:30:38 +0100
Subject: [PATCH] updated README.md

---
 .gitignore | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31e0c50..8389a4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 /build/
 /install/
 /log/
-<<<<<<< HEAD
-/.idea/
-=======
-.idea
->>>>>>> origin/main
+.idea/
+