From 392b4cad13badc40c1fee27e70f0ecc98412ae51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=97=D0=BB=20=D0=93=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B3=D0=BE=D1=80=27=D1=94=D0=B2?= <dengr1065@gmail.com>
Date: Thu, 20 Jun 2024 12:50:37 +0300
Subject: [PATCH] Merge .gitignore files

Prettier only takes the root .gitignore into account, which leads to
formatting of auto-generated files. Moving ignore patterns into the root
.gitignore file makes Prettier follow them and cleans up the workspace.
---
 .gitignore              | 4 ++++
 electron/.gitignore     | 1 -
 gulp/.gitignore         | 1 -
 src/js/.gitignore       | 1 -
 translations/.gitignore | 1 -
 5 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 electron/.gitignore
 delete mode 100644 gulp/.gitignore
 delete mode 100644 src/js/.gitignore
 delete mode 100644 translations/.gitignore

diff --git a/.gitignore b/.gitignore
index 5d373bb8..257ed51d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,7 @@ config.local.js
 
 build_output
 tmp
+
+src/js/built-temp
+translations/tmp
+gulp/additional_build_files
diff --git a/electron/.gitignore b/electron/.gitignore
deleted file mode 100644
index 0cdb30f4..00000000
--- a/electron/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-mods/*.js
\ No newline at end of file
diff --git a/gulp/.gitignore b/gulp/.gitignore
deleted file mode 100644
index 80dc3c89..00000000
--- a/gulp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-additional_build_files
diff --git a/src/js/.gitignore b/src/js/.gitignore
deleted file mode 100644
index d71c2f1e..00000000
--- a/src/js/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-built-temp
diff --git a/translations/.gitignore b/translations/.gitignore
deleted file mode 100644
index 6f7f420d..00000000
--- a/translations/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tmp