conflicts

moevm · Nov 9, 2024 · e9445a0 · e9445a0
2 parents 6535351 + 7a5287c
commit e9445a0
Show file tree

Hide file tree

Showing 20 changed files with 7,365 additions and 177 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,29 @@ share/python-wheels/
 *.egg
 
 # Pytest cache
-.pytest_cache
+.pytest_cache
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?