From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 21 Feb 2012 02:57:25 +0000 (-0500)
Subject: belately resolve conflicts here
X-Git-Tag: v2.7.3rc1~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6949299e643f2f525e0ea456c88107650727c208;p=thirdparty%2FPython%2Fcpython.git

belately resolve conflicts here
---

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 5a5eed4949bb..2e1bc8575635 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