From d4a69f9eea1c3c9c316724523e8900b45f55d405 Mon Sep 17 00:00:00 2001
From: tobjend <tobend85@gmail.com>
Date: Tue, 11 Feb 2025 20:51:41 +0100
Subject: [PATCH] .gitignore

---
 .gitignore | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8cf697c..0a86907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 .DS_Store
 node_modules/
 package-lock.json
@@ -5,3 +6,17 @@ yarn.lock
 npm-debug.log
 .idea/
 dist/
+=======
+# ---> Vue
+# gitignore template for Vue.js projects
+#
+# Recommended template: Node.gitignore
+
+# TODO: where does this rule come from?
+docs/_book
+
+# TODO: where does this rule come from?
+test/
+
+node_modules
+>>>>>>> cfdf6a3 (.gitignore)