diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 02:57:25 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 02:57:25 (GMT) |
| commit | 6949299e643f2f525e0ea456c88107650727c208 (patch) | |
| tree | 1ff36f7ef1d920fdb81439f00ac20bd0794e870d | |
| parent | 11fa11bc953f7e37788798ef655ac624ac7787f4 (diff) | |
| download | cpython-6949299e643f2f525e0ea456c88107650727c208.zip cpython-6949299e643f2f525e0ea456c88107650727c208.tar.gz cpython-6949299e643f2f525e0ea456c88107650727c208.tar.bz2 | |
belately resolve conflicts here
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index 5a5eed4..2e1bc85 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
|