From af398c221b261e199abcee013925569b6df830c0 Mon Sep 17 00:00:00 2001
From: YingXing <yingxing.cheng@mathematik.uni-stuttgart.de>
Date: Fri, 13 Oct 2023 11:46:38 +0200
Subject: [PATCH] fix conflicts

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

diff --git a/.gitignore b/.gitignore
index 746d7da..b6ba457 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,4 @@
 *.jl.*.cov
 .ipynb_checkpoints
 *.gif
-.DS_Store
 Manifest.toml
-- 
GitLab