From f7ec9dfced99fab7812d2861bcfd75f52482f2c7 Mon Sep 17 00:00:00 2001
From: mserranom <mserranom@gmail.com>
Date: Mon, 17 Feb 2020 13:58:48 +0100
Subject: [PATCH] merged .gitignore

---
 .gitignore              | 7 +++++--
 docker-image/.gitignore | 4 ----
 2 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 docker-image/.gitignore

diff --git a/.gitignore b/.gitignore
index abf5d3ff2f..008b9d7cae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 /config
 config-local
-node_modules
+
+node_modules/
+api-data
+versions/
 
 web
 document-updater
@@ -20,4 +23,4 @@ tmp
 db.sqlite
 
 .DS_Store
-.vagrant
+.vagrant
\ No newline at end of file
diff --git a/docker-image/.gitignore b/docker-image/.gitignore
deleted file mode 100644
index 877b99b865..0000000000
--- a/docker-image/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.DS_Store
-node_modules/
-api-data
-versions/