mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
Fix broken conflict resolution
This commit is contained in:
@@ -822,17 +822,6 @@
|
|||||||
<ClCompile Include="..\..\modules\ripple_app\ripple_app_pt8.cpp">
|
<ClCompile Include="..\..\modules\ripple_app\ripple_app_pt8.cpp">
|
||||||
<Filter>[1] Ripple\ripple_app</Filter>
|
<Filter>[1] Ripple\ripple_app</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\modules\ripple_app\ripple_app_pt5.cpp">
|
|
||||||
<Filter>1. Modules\ripple_app</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\modules\ripple_app\ripple_app_pt6.cpp">
|
|
||||||
<Filter>1. Modules\ripple_app</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\modules\ripple_app\ripple_app_pt7.cpp">
|
|
||||||
<Filter>1. Modules\ripple_app</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="..\..\modules\ripple_app\ripple_app_pt8.cpp">
|
|
||||||
<Filter>1. Modules\ripple_app</Filter>
|
|
||||||
<ClCompile Include="..\..\modules\ripple_basics\utility\ripple_LogFile.cpp">
|
<ClCompile Include="..\..\modules\ripple_basics\utility\ripple_LogFile.cpp">
|
||||||
<Filter>[1] Ripple\ripple_basics\utility</Filter>
|
<Filter>[1] Ripple\ripple_basics\utility</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
|||||||
Reference in New Issue
Block a user