Merge pull request #2683 from bgoonz/dev

Dev
bgoonz · Jun 28, 2022 · 1716e7f · 1716e7f
2 parents 9f26bb1 + 753e72a
commit 1716e7f
Show file tree

Hide file tree

Showing 366 changed files with 480,238 additions and 46,291 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["next/babel"]
+}
diff --git a/.gitignore b/.gitignore
@@ -94,7 +94,4 @@ node_modules/
 
 
 *.cache
-
-*public/
-
-package.lock.json
+*public
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+<<<<<<< HEAD
+    "docwriter.style": "JSDoc"
+}
+=======
+      "makefile.extensionOutputFolder": "./.vscode"
+}
+>>>>>>> 9ea7661897a3ed46abf375d7cac8d77a135e3eff