From 6949299e643f2f525e0ea456c88107650727c208 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 20 Feb 2012 21:57:25 -0500
Subject: [PATCH] belately resolve conflicts here

---
 PCbuild/pythoncore.vcproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 5a5eed4949..2e1bc85756 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1,4 +1,3 @@
-<<<<<<< local
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
@@ -3694,4 +3693,3 @@
 	<Globals>
 	</Globals>
 </VisualStudioProject>
->>>>>>> other
-- 
2.40.0