From 938005cd9fbf7981454b7ed62db0caaee08c5dd8 Mon Sep 17 00:00:00 2001
From: Sam <sam@sam.wf>
Date: Mon, 20 Mar 2023 16:40:36 +0100
Subject: [PATCH] chore: merge gitignore files

---
 .gitignore          | 11 +++++++----
 frontend/.gitignore | 10 ----------
 2 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 frontend/.gitignore

diff --git a/.gitignore b/.gitignore
index ae27ec4..9169dd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,13 @@
 .vscode
 node_modules
 *.log*
-.nuxt
-.nitro
-.cache
-.output
 .env
+.env.*
+!.env.example
 dist
 dump.rdb
+build
+.svelte-kit
+package
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*
diff --git a/frontend/.gitignore b/frontend/.gitignore
deleted file mode 100644
index 6635cf5..0000000
--- a/frontend/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.DS_Store
-node_modules
-/build
-/.svelte-kit
-/package
-.env
-.env.*
-!.env.example
-vite.config.js.timestamp-*
-vite.config.ts.timestamp-*