Sync files

tomarv2 · tomarv2 · commit 7ad385323f1a · 2022-03-03T19:02:16.000Z
diff --git a/.gitignore b/.gitignore
@@ -79,7 +79,6 @@ _testmain.go
 /test/run.out
 /test/times.out
 
-<<<<<<< HEAD
 # Python
 # Editors
 .vscode/
