Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

belately resolve conflicts here

This commit is contained in:
Benjamin Peterson 2012-02-20 21:57:25 -05:00
parent 11fa11bc95
commit 6949299e64
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PCbuild/pythoncore.vcproj
View File

@ -1,4 +1,3 @@
<<<<<<< local
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
@ -3694,4 +3693,3 @@
<Globals>
</Globals>
</VisualStudioProject>
>>>>>>> other