From c4f1421a1560c22e7c5c2ac0dbf5ad2eb36ee835 Mon Sep 17 00:00:00 2001
From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com>
Date: Wed, 25 May 2022 00:51:40 +0200
Subject: [PATCH] Update .gitignore

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 302fe5578..71bc3b594 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .dbeaver/*
 =======
 .dbeaver