From 513e03053968c0bdc2e13f75054cf2c199a0c49b Mon Sep 17 00:00:00 2001
From: s233039 <s233039@student.dtu.dk>
Date: Wed, 18 Sep 2024 17:04:27 +0200
Subject: [PATCH] Update __init__.py

---
 qim3d/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qim3d/__init__.py b/qim3d/__init__.py
index 011b64ff..119a2f42 100644
--- a/qim3d/__init__.py
+++ b/qim3d/__init__.py
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 """qim3d: A Python package for 3D image processing and visualization.
 
 The qim3d library is designed to make it easier to work with 3D imaging data in Python. 
-- 
GitLab