belately resolve conflicts here

6770aa78 · Benjamin Peterson · f2eee1fd · 6770aa78
Commit 6770aa78 authored Feb 20, 2012 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

PCbuild/pythoncore.vcproj PCbuild/pythoncore.vcproj +0 -2

No files found.
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
-<<<<<<< local
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
@@ -3694,4 +3693,3 @@
 	<Globals>
 	</Globals>
 </VisualStudioProject>
->>>>>>> other