Update .gitignore (#17)

shoumikhin · Nikhil Viswanath Sivakumar · commit 57962b9871b9 · 2025-04-23T12:54:48.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -14,11 +14,4 @@ xcuserdata/
 .build/
 .swiftpm/
 *.xcworkspace/
-<<<<<<< HEAD
 *.xcframework/
-=======
-
-# MV2
-mv2/cpp/build
-
->>>>>>> 54b0238 (MV2 cpp and python example (#13))
