From 3fb59b519c4f66baa4f433248af6531960794b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= <claus-peter.huebner@email.de>
Date: Thu, 16 Jun 2022 00:57:25 +0200
Subject: [PATCH] ignore .project and .dbeaver

---
 .gitignore | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7ff1e202d..f1a8e9157 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-.dbeaver/*
+/.dbeaver/*
 .project
-=======
->>>>>>> refs/remotes/origin/master
 *.log
 *.bak
 /node_modules/*