From 52833ed252cc9b8263eba7d393e754312861b8e2 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 01:05:32 +0200
Subject: [PATCH] next try to ignore .dbeaver

---
 .dbeaver/data-sources.json | 17 -----------------
 .gitignore                 |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/.dbeaver/data-sources.json b/.dbeaver/data-sources.json
index bfeae8069..e0ca3441f 100644
--- a/.dbeaver/data-sources.json
+++ b/.dbeaver/data-sources.json
@@ -1,7 +1,6 @@
 {
 	"folders": {},
 	"connections": {
-<<<<<<< HEAD
 		"mariaDB-180637bab9c-385a8c5454123150": {
 			"provider": "mysql",
 			"driver": "mariaDB",
@@ -39,22 +38,6 @@
 						}
 					}
 				}
-=======
-		"mariaDB-1813fbbc7bc-107c0b3aeaeb91ab": {
-			"provider": "mysql",
-			"driver": "mariaDB",
-			"name": "gradido",
-			"save-password": true,
-			"read-only": false,
-			"configuration": {
-				"host": "localhost",
-				"port": "3306",
-				"url": "jdbc:mariadb://localhost:3306/",
-				"home": "mysql_client",
-				"type": "dev",
-				"auth-model": "native",
-				"handlers": {}
->>>>>>> refs/remotes/origin/master
 			}
 		}
 	},
diff --git a/.gitignore b/.gitignore
index f1a8e9157..1a111760f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/.dbeaver/*
+.dbeaver
 .project
 *.log
 *.bak