From: Mark Hammond <mhammond@skippinet.com.au>
Date: Sun, 23 Oct 2005 10:50:04 +0000 (+0000)
Subject: Remove conflict markers and add parsermodule.c to get things building
X-Git-Tag: v2.5a0~1243
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5da5b5bd47f6e3508ff797182e1220c15fdaec12;p=python

Remove conflict markers and add parsermodule.c to get things building
---

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index ff9e48bec4..48d1489324 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -814,6 +814,9 @@
 		<File
 			RelativePath="..\Modules\collectionsmodule.c">
 		</File>
+		<File
+			RelativePath="..\Python\compile.c">
+		</File>
 		<File
 			RelativePath="..\Objects\complexobject.c">
 			<FileConfiguration
@@ -2317,9 +2320,6 @@
 					PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\Python\compile.c">
-		</File>
 		<File
 			RelativePath="..\Parser\node.c">
 			<FileConfiguration
@@ -2455,6 +2455,9 @@
 					PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\Modules\parsermodule.c">
+		</File>
 		<File
 			RelativePath="..\Parser\parsetok.c">
 			<FileConfiguration
@@ -2759,7 +2762,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\shamodule.c">
+			RelativePath="..\Modules\sha256module.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2786,8 +2789,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-<<<<<<< pythoncore.vcproj
-                        RelativePath="..\Modules\sha256module.c">
+			RelativePath="..\Modules\sha512module.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2814,7 +2816,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-                        RelativePath="..\Modules\sha512module.c">
+			RelativePath="..\Modules\sha512module.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2841,10 +2843,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\signalmodule.c">
-=======
-                        RelativePath="..\Modules\sha256module.c">
->>>>>>> 1.26.2.3
+			RelativePath="..\Modules\shamodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2871,7 +2870,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-                        RelativePath="..\Modules\sha512module.c">
+			RelativePath="..\Modules\signalmodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool