From 5da5b5bd47f6e3508ff797182e1220c15fdaec12 Mon Sep 17 00:00:00 2001 From: Mark Hammond Date: Sun, 23 Oct 2005 10:50:04 +0000 Subject: [PATCH] Remove conflict markers and add parsermodule.c to get things building --- PCbuild/pythoncore.vcproj | 175 +++++++++++++++++++------------------- 1 file changed, 87 insertions(+), 88 deletions(-) diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index ff9e48bec4b..48d14893241 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -814,6 +814,9 @@ + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - -======= - RelativePath="..\Modules\sha256module.c"> ->>>>>>> 1.26.2.3 - - - - - - - - - - -