Merge pull request #2 from tomarv2/develop

tomarv2 · web-flow · commit 7f4bb2c52461 · 2022-03-03T11:03:23.000-08:00
Sync files
diff --git a/.gitignore b/.gitignore
@@ -79,7 +79,6 @@ _testmain.go
 /test/run.out
 /test/times.out
 
-<<<<<<< HEAD
 # Python
 # Editors
 .vscode/
