Fix broken conflict resolution

This commit is contained in:
Vinnie Falco
2013-07-07 19:18:37 -07:00
parent fa56c018da
commit 635165c724

View File

@@ -822,17 +822,6 @@
<ClCompile Include="..\..\modules\ripple_app\ripple_app_pt8.cpp">
<Filter>[1] Ripple\ripple_app</Filter>
</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">
<Filter>[1] Ripple\ripple_basics\utility</Filter>
</ClCompile>