Auto stash before merge of "master" and "upstream/main"

casabre · casabre · commit 2a3c3ca64340 · 2022-12-07T09:19:46.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -37,8 +37,9 @@
 keras_complex.egg-info/
 build/
 
-.venv
+# Ignore virtual environment
 venv
+.venv
 
 .vscode
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.formatting.provider": "black"
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "python.formatting.provider": "black"`
	`3`	`+}`