From 5da5b5bd47f6e3508ff797182e1220c15fdaec12 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Sun, 23 Oct 2005 10:50:04 +0000
Subject: Remove conflict markers and add parsermodule.c to get things building

---
 PCbuild/pythoncore.vcproj | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index ff9e48b..48d1489 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -815,6 +815,9 @@
 			RelativePath="..\Modules\collectionsmodule.c">
 		</File>
 		<File
+			RelativePath="..\Python\compile.c">
+		</File>
+		<File
 			RelativePath="..\Objects\complexobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2318,9 +2321,6 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\compile.c">
-		</File>
-		<File
 			RelativePath="..\Parser\node.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2456,6 +2456,9 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\Modules\parsermodule.c">
+		</File>
+		<File
 			RelativePath="..\Parser\parsetok.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -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
-- 
cgit v0.12