From 949dd502570be28ebcc6746e91c9e80dc17e7d90 Mon Sep 17 00:00:00 2001
From: Leon Luithlen <leon@topoteretes.com>
Date: Tue, 12 Nov 2024 14:43:42 +0100
Subject: [PATCH] Copy over gitignore

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

diff --git a/.gitignore b/.gitignore
index 71b340ea7..d256013d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,8 @@
 .prod.env
 cognee/.data/
 
-<<<<<<< HEAD
 *.lance/
 .DS_Store
-=======
-
-.DS_Store
-
->>>>>>> dd11da9 (Rebase onto main)
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]