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

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index ff9e48bec4bcc9e3ce456041f16904a266c26148..48d14893241b3a4198855a85e1340d35bd1f4bf3 100644 (file)
--- 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