From 9c2148141489956ad940b0799c473ee46c01e774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= <claus-peter.huebner@email.de>
Date: Wed, 1 Jun 2022 02:34:14 +0200
Subject: [PATCH] resolve conflicts in .gitignore

---
 .dbeaver/.credentials-config.json.bak |  1 +
 .dbeaver/.data-sources.json.bak       | 55 +++++++++++++++++++++++++++
 .dbeaver/credentials-config.json      |  2 +
 .dbeaver/data-sources.json            | 55 +++++++++++++++++++++++++++
 .gitignore                            | 11 ------
 .project                              | 18 +++++++++
 6 files changed, 131 insertions(+), 11 deletions(-)
 create mode 100644 .dbeaver/.credentials-config.json.bak
 create mode 100644 .dbeaver/.data-sources.json.bak
 create mode 100644 .dbeaver/credentials-config.json
 create mode 100644 .dbeaver/data-sources.json
 create mode 100644 .project

diff --git a/.dbeaver/.credentials-config.json.bak b/.dbeaver/.credentials-config.json.bak
new file mode 100644
index 000000000..254ff7949
--- /dev/null
+++ b/.dbeaver/.credentials-config.json.bak
@@ -0,0 +1 @@
+��l�"a�`�ù��&
�YOl�>u�A�W��TL`���4)4��$;���?'���RX+�!a�"�X[�����(0"�l��	hq[�؂�,C��)
\ No newline at end of file
diff --git a/.dbeaver/.data-sources.json.bak b/.dbeaver/.data-sources.json.bak
new file mode 100644
index 000000000..cd5d6163f
--- /dev/null
+++ b/.dbeaver/.data-sources.json.bak
@@ -0,0 +1,55 @@
+{
+	"folders": {},
+	"connections": {
+		"mariaDB-180637bab9c-385a8c5454123150": {
+			"provider": "mysql",
+			"driver": "mariaDB",
+			"name": "gradido_community",
+			"save-password": true,
+			"read-only": false,
+			"configuration": {
+				"host": "localhost",
+				"port": "3306",
+				"database": "gradido_community",
+				"url": "jdbc:mariadb://localhost:3306/gradido_community",
+				"home": "mysql_client",
+				"type": "dev",
+				"auth-model": "native"
+			},
+			"custom-properties": {
+				"resultset.binary.representation": "hex"
+			}
+		}
+	},
+	"virtual-models": {
+		"mariaDB-180637bab9c-385a8c5454123150": {
+			"gradido_community": {
+				":users": {
+					"properties": {
+						"erd.diagram.state": {
+							"serialized": "<diagram version=\"1\" name=\"empty\" time=\"202205192015\"><entities><data-source id=\"mariaDB-180637bab9c-385a8c5454123150\"><entity id=\"1\" name=\"users\" fq-name=\"gradido_community.users\" order=\"0\" color-bg=\"255,128,64\" x=\"340\" y=\"201\"><path name=\"gradido_community\"/></entity><entity id=\"2\" name=\"user_setting\" fq-name=\"gradido_community.user_setting\" order=\"1\" x=\"367\" y=\"563\"><path name=\"gradido_community\"/></entity><entity id=\"3\" name=\"transactions\" fq-name=\"gradido_community.transactions\" order=\"2\" x=\"604\" y=\"33\"><path name=\"gradido_community\"/></entity><entity id=\"4\" name=\"transaction_links\" fq-name=\"gradido_community.transaction_links\" order=\"3\" x=\"601\" y=\"351\"><path name=\"gradido_community\"/></entity><entity id=\"5\" name=\"migrations\" fq-name=\"gradido_community.migrations\" order=\"4\" x=\"27\" y=\"27\"><path name=\"gradido_community\"/></entity><entity id=\"6\" name=\"login_email_opt_in\" fq-name=\"gradido_community.login_email_opt_in\" order=\"5\" x=\"17\" y=\"166\"><path name=\"gradido_community\"/></entity><entity id=\"7\" name=\"login_elopage_buys\" fq-name=\"gradido_community.login_elopage_buys\" order=\"6\" x=\"18\" y=\"354\"><path name=\"gradido_community\"/></entity><entity id=\"8\" name=\"admin_pending_creations\" fq-name=\"gradido_community.admin_pending_creations\" order=\"7\" x=\"343\" y=\"12\"><path name=\"gradido_community\"/></entity><entity id=\"9\" name=\"Contributions\" fq-name=\"gradido_community.Contributions\" order=\"8\" x=\"954\" y=\"162\"><path name=\"gradido_community\"/></entity><entity id=\"10\" name=\"ContributionCategory\" fq-name=\"gradido_community.ContributionCategory\" order=\"9\" x=\"954\" y=\"15\"><path name=\"gradido_community\"/></entity><entity id=\"11\" name=\"CreationActivities\" fq-name=\"gradido_community.CreationActivities\" order=\"10\" border-width=\"3\" x=\"958\" y=\"523\"><path name=\"gradido_community\"/></entity></data-source></entities><relations/></diagram>"
+						}
+					},
+					"attributes": {
+						"public_key": {
+							"transforms": {
+								"custom": "resultset.binary.representation"
+							}
+						}
+					}
+				}
+			}
+		}
+	},
+	"connection-types": {
+		"dev": {
+			"name": "Development",
+			"color": "255,255,255",
+			"description": "Regular development database",
+			"auto-commit": true,
+			"confirm-execute": false,
+			"confirm-data-change": false,
+			"auto-close-transactions": false
+		}
+	}
+}
\ No newline at end of file
diff --git a/.dbeaver/credentials-config.json b/.dbeaver/credentials-config.json
new file mode 100644
index 000000000..685527df0
--- /dev/null
+++ b/.dbeaver/credentials-config.json
@@ -0,0 +1,2 @@
+�
+�_��?��e��B�K�~9!&Rf)v��
��`�
}^<��	&�a�-��w4�c1I�rԙ�d��ONX
��[�Bf�Z�X��H�AOy�[c
\ No newline at end of file
diff --git a/.dbeaver/data-sources.json b/.dbeaver/data-sources.json
new file mode 100644
index 000000000..e0ca3441f
--- /dev/null
+++ b/.dbeaver/data-sources.json
@@ -0,0 +1,55 @@
+{
+	"folders": {},
+	"connections": {
+		"mariaDB-180637bab9c-385a8c5454123150": {
+			"provider": "mysql",
+			"driver": "mariaDB",
+			"name": "gradido_community",
+			"save-password": true,
+			"read-only": false,
+			"configuration": {
+				"host": "localhost",
+				"port": "3306",
+				"database": "gradido_community",
+				"url": "jdbc:mariadb://localhost:3306/gradido_community",
+				"home": "mysql_client",
+				"type": "dev",
+				"auth-model": "native"
+			},
+			"custom-properties": {
+				"resultset.binary.representation": "hex"
+			}
+		}
+	},
+	"virtual-models": {
+		"mariaDB-180637bab9c-385a8c5454123150": {
+			"gradido_community": {
+				":users": {
+					"properties": {
+						"erd.diagram.state": {
+							"serialized": "<diagram version=\"1\" name=\"empty\" time=\"202205200159\"><entities><data-source id=\"mariaDB-180637bab9c-385a8c5454123150\"><entity id=\"1\" name=\"users\" fq-name=\"gradido_community.users\" order=\"0\" color-bg=\"255,128,64\" x=\"331\" y=\"192\"><path name=\"gradido_community\"/></entity><entity id=\"2\" name=\"user_setting\" fq-name=\"gradido_community.user_setting\" order=\"1\" x=\"322\" y=\"612\"><path name=\"gradido_community\"/></entity><entity id=\"3\" name=\"transactions\" fq-name=\"gradido_community.transactions\" order=\"3\" x=\"653\" y=\"28\"><path name=\"gradido_community\"/></entity><entity id=\"4\" name=\"transaction_links\" fq-name=\"gradido_community.transaction_links\" order=\"4\" x=\"1044\" y=\"36\"><path name=\"gradido_community\"/></entity><entity id=\"5\" name=\"migrations\" fq-name=\"gradido_community.migrations\" order=\"5\" x=\"27\" y=\"27\"><path name=\"gradido_community\"/></entity><entity id=\"6\" name=\"login_email_opt_in\" fq-name=\"gradido_community.login_email_opt_in\" order=\"6\" x=\"-70\" y=\"187\"><path name=\"gradido_community\"/></entity><entity id=\"7\" name=\"login_elopage_buys\" fq-name=\"gradido_community.login_elopage_buys\" order=\"7\" x=\"3\" y=\"464\"><path name=\"gradido_community\"/></entity><entity id=\"8\" name=\"PendingActivities\" fq-name=\"gradido_community.PendingActivities\" order=\"8\" x=\"656\" y=\"502\"><path name=\"gradido_community\"/></entity><entity id=\"9\" name=\"Contributions\" fq-name=\"gradido_community.Contributions\" order=\"2\" x=\"1025\" y=\"367\"><path name=\"gradido_community\"/></entity></data-source></entities><relations><relation name=\"PendingActivities_FK\" fq-name=\"gradido_community.PendingActivities.PendingActivities_FK\" type=\"fk\" pk-ref=\"1\" fk-ref=\"8\"><bend type=\"abs\" x=\"597\" y=\"511\"/></relation><relation name=\"PendingActivities_FK_2\" fq-name=\"gradido_community.PendingActivities.PendingActivities_FK_2\" type=\"fk\" pk-ref=\"1\" fk-ref=\"8\"/><relation name=\"transactions_FK\" fq-name=\"gradido_community.transactions.transactions_FK\" type=\"fk\" pk-ref=\"1\" fk-ref=\"3\"/><relation name=\"users_FK\" fq-name=\"gradido_community.users.users_FK\" type=\"fk\" pk-ref=\"1\" fk-ref=\"1\"><bend type=\"abs\" x=\"481\" y=\"566\"/><bend type=\"abs\" x=\"446\" y=\"566\"/></relation><relation name=\"user_setting_FK\" fq-name=\"gradido_community.user_setting.user_setting_FK\" type=\"fk\" pk-ref=\"1\" fk-ref=\"2\"/><relation name=\"login_email_opt_in_FK\" fq-name=\"gradido_community.login_email_opt_in.login_email_opt_in_FK\" type=\"fk\" pk-ref=\"1\" fk-ref=\"6\"/><relation name=\"transactions_FK_1\" fq-name=\"gradido_community.transactions.transactions_FK_1\" type=\"fk\" pk-ref=\"4\" fk-ref=\"3\"/><relation name=\"PendingActivities_FK_1\" fq-name=\"gradido_community.PendingActivities.PendingActivities_FK_1\" type=\"fk\" pk-ref=\"9\" fk-ref=\"8\"/><relation name=\"users_FK_1\" fq-name=\"gradido_community.users.users_FK_1\" type=\"fk\" pk-ref=\"9\" fk-ref=\"1\"/></relations></diagram>"
+						}
+					},
+					"attributes": {
+						"public_key": {
+							"transforms": {
+								"custom": "resultset.binary.representation"
+							}
+						}
+					}
+				}
+			}
+		}
+	},
+	"connection-types": {
+		"dev": {
+			"name": "Development",
+			"color": "255,255,255",
+			"description": "Regular development database",
+			"auto-commit": true,
+			"confirm-execute": false,
+			"confirm-data-change": false,
+			"auto-close-transactions": false
+		}
+	}
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a2f7ef2b3..6ac3a32c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-.dbeaver/*
-=======
-.dbeaver
-.project
->>>>>>> refs/remotes/origin/improve-apollo-logging
-=======
-.dbeaver
-.project
->>>>>>> refs/remotes/origin/master
 *.log
 /node_modules/*
 messages.pot
diff --git a/.project b/.project
new file mode 100644
index 000000000..5d9663f32
--- /dev/null
+++ b/.project
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Gradido</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.jkiss.dbeaver.DBeaverNature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>