belately resolve conflicts here

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