From 6d635288465ebc806fa9bc52cfb63f2c16fde11f Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Tue, 16 Feb 2021 01:13:31 +0100
Subject: [PATCH] Merge gitignore files

---
 .gitignore                            | 3 +++
 examples/dj-iconify-server/.gitignore | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 examples/dj-iconify-server/.gitignore

diff --git a/.gitignore b/.gitignore
index c9a6fd3..13ebbe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,6 @@ DEADJOE
 
 # Database
 db.sqlite3
+node_modules/
+package.json
+yarn.lock
diff --git a/examples/dj-iconify-server/.gitignore b/examples/dj-iconify-server/.gitignore
deleted file mode 100644
index 148de31..0000000
--- a/examples/dj-iconify-server/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-node_modules/
-package.json
-yarn.lock
-- 
GitLab