From 187f018e26f8a5ef7851b8a46eb6aede6c80a298 Mon Sep 17 00:00:00 2001
From: scopesorting <max.metz@scope-sorting.com>
Date: Tue, 19 Dec 2023 09:26:55 +0100
Subject: [PATCH] gitignore (solved conflict)

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2eea059..5ce71e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -287,6 +287,5 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
 src/notebooks_metz/
 src/server/editable_requirements.txt