@@ -1,3 +1,4 @@
+<<<<<<< HEAD
# ---> Go
# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
@@ -24,3 +25,6 @@ _testmain.go
*.test
*.prof
+.vscode/
+*.exe
+>>>>>>> 1cc34e1... global gitignore
Douglas R Andreani