From 56f9a8db329b9450119a0e3aed699fb9e0d850ee Mon Sep 17 00:00:00 2001
From: turtlebasket <turtlebasket@gmail.com>
Date: Tue, 13 Jun 2023 13:57:53 -0700
Subject: [PATCH] remove merge resolution output from .gitignore

---
 .gitignore | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 46759a4..871ddd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,7 @@
 build*/*
 *.so
 public/
-<<<<<<< HEAD
 *.exe
-=======
->>>>>>> master
 
 # Eclispe setting --- do not ignore *.cproject and *.project
 */**/.settings
@@ -237,8 +234,4 @@ callgrind.out.*
 .cache
 .pytest_cache
 .mypy_cache
-<<<<<<< HEAD
-=======
-=======
->>>>>>> master
->>>>>>> cmakeWin
+