Update .gitignore to resolve merge conflicts

Removed conflicting entries and added new patterns.

Author: cherubrock-seb

.gitignore

@@ -27,13 +27,10 @@ logs/
 stage1_result_*.txt
 worktodo*.txt
 *.save
-<<<<<<< HEAD
 *.ckpt
-||||||| parent of 7a412ca (gitignore)
-=======
+lastcurve.gp
 /vcpkg
 /prmers.exe
 /*.zip
 /package
 /.vscode
->>>>>>> 7a412ca (gitignore)