Skip to content

C
cpython
Commit 5da5b5bd authored by Mark Hammond's avatar Mark Hammond
Browse files
Options

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

parent d56827c3
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 12 deletions
PCbuild/pythoncore.vcproj
View file @ 5da5b5bd
...@@ -814,6 +814,9 @@ ...@@ -814,6 +814,9 @@
<File <File
RelativePath="..\Modules\collectionsmodule.c"> RelativePath="..\Modules\collectionsmodule.c">
</File> </File>
<File
RelativePath="..\Python\compile.c">
</File>
<File <File
RelativePath="..\Objects\complexobject.c"> RelativePath="..\Objects\complexobject.c">
<FileConfiguration <FileConfiguration
...@@ -2317,9 +2320,6 @@ ...@@ -2317,9 +2320,6 @@
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\Python\compile.c">
</File>
<File <File
RelativePath="..\Parser\node.c"> RelativePath="..\Parser\node.c">
<FileConfiguration <FileConfiguration
...@@ -2455,6 +2455,9 @@ ...@@ -2455,6 +2455,9 @@
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\Modules\parsermodule.c">
</File>
<File <File
RelativePath="..\Parser\parsetok.c"> RelativePath="..\Parser\parsetok.c">
<FileConfiguration <FileConfiguration
...@@ -2759,7 +2762,7 @@ ...@@ -2759,7 +2762,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\Modules\shamodule.c"> RelativePath="..\Modules\sha256module.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
...@@ -2786,8 +2789,7 @@ ...@@ -2786,8 +2789,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
<<<<<<< pythoncore.vcproj RelativePath="..\Modules\sha512module.c">
RelativePath="..\Modules\sha256module.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
...@@ -2814,7 +2816,7 @@ ...@@ -2814,7 +2816,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\Modules\sha512module.c"> RelativePath="..\Modules\sha512module.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
...@@ -2841,10 +2843,7 @@ ...@@ -2841,10 +2843,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\Modules\signalmodule.c"> RelativePath="..\Modules\shamodule.c">
=======
RelativePath="..\Modules\sha256module.c">
>>>>>>> 1.26.2.3
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
...@@ -2871,7 +2870,7 @@ ...@@ -2871,7 +2870,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\Modules\sha512module.c"> RelativePath="..\Modules\signalmodule.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7