From 74392770a374ba7ed0a2412539ad0c49dd924b3b Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sat, 10 Jul 2021 00:24:45 +0200
Subject: [PATCH] Delete conflicting file, yolo

---
 .obsidian-git-data | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 .obsidian-git-data

diff --git a/.obsidian-git-data b/.obsidian-git-data
deleted file mode 100644
index bb2a93716..000000000
--- a/.obsidian-git-data
+++ /dev/null
@@ -1,28 +0,0 @@
-Sat Jul 10 2021 00:23:17 GMT+0200 (Central European Summer Time)
-Sat Jul 10 2021 00:23:17 GMT+0200 (Central European Summer Time)
-Thu Jul 08 2021 18:51:44 GMT+0200 (Central European Summer Time)
-Thu Jul 08 2021 02:04:10 GMT+0200 (Central European Summer Time)
-=======
-Thu Jul 08 2021 02:03:54 GMT+0200 (Central European Summer Time)
-Thu Jul 08 2021 02:02:54 GMT+0200 (Central European Summer Time)
-=======
-Thu Jul 08 2021 18:51:55 GMT+0200 (Central European Summer Time)
-Thu Jul 08 2021 18:50:55 GMT+0200 (Central European Summer Time)
->>>>>>> 1f3c4fedc273f7cb0cb25384122a8b17ed7389ba
-Wed Jul 07 2021 12:58:41 GMT+0200 (Central European Summer Time)
-=======
-Wed Jul 07 2021 00:33:04 GMT+0200 (Central European Summer Time)
-Wed Jul 07 2021 00:32:07 GMT+0200 (Central European Summer Time)
->>>>>>> 9008f5c48094e40cd632f6a9ae31197e6e3bfba6
-Tue Jul 06 2021 20:52:05 GMT+0200 (Central European Summer Time)
-=======
-Tue Jul 06 2021 20:52:38 GMT+0200 (Central European Summer Time)
-Tue Jul 06 2021 20:51:38 GMT+0200 (Central European Summer Time)
->>>>>>> 197eacf36fb5b01000a95f88b0051ca201b89431
-Mon Jul 05 2021 17:42:20 GMT+0200 (Central European Summer Time)
-=======
-Mon Jul 05 2021 01:04:00 GMT+0200 (Central European Summer Time)
-Mon Jul 05 2021 01:03:00 GMT+0200 (Central European Summer Time)
->>>>>>> 7c6293f6a307c338d99e0246985590932a2266a2
-Sat Jul 03 2021 13:05:07 GMT+0200 (Central European Summer Time)
->>>>>>> 32f2963de50e36ac5299026bb881ee68667fcdc6