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 1/3] Update .gitignore Co-authored-by: Moriz Wahl --- .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 From e7bdd8490f700678f6ef1f277d507f5965cf1d23 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Wed, 25 May 2022 00:51:57 +0200 Subject: [PATCH 2/3] Update .gitignore Co-authored-by: Moriz Wahl --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 71bc3b594..8978beeaf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ .dbeaver/* -======= -.dbeaver .project >>>>>>> refs/remotes/origin/improve-apollo-logging *.log From e7252e4c166b2bf2d7df17fef924be6684a289f2 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Wed, 25 May 2022 00:52:09 +0200 Subject: [PATCH 3/3] Update .gitignore Co-authored-by: Moriz Wahl --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8978beeaf..ab879e79a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .dbeaver/* .project ->>>>>>> refs/remotes/origin/improve-apollo-logging *.log /node_modules/* messages.pot