diff options
Diffstat (limited to 'vsprojects')
| -rw-r--r-- | vsprojects/grpc/grpc.vcxproj | 4 | ||||
| -rw-r--r-- | vsprojects/grpc/grpc.vcxproj.filters | 6 | ||||
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | 4 | ||||
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters | 6 |
4 files changed, 0 insertions, 20 deletions
diff --git a/vsprojects/grpc/grpc.vcxproj b/vsprojects/grpc/grpc.vcxproj index 5921e513ad..1fa7e4b4f1 100644 --- a/vsprojects/grpc/grpc.vcxproj +++ b/vsprojects/grpc/grpc.vcxproj @@ -307,12 +307,8 @@ <ClInclude Include="..\..\src\core\json\json_reader.h" /> <ClInclude Include="..\..\src\core\json\json_writer.h" /> <ClInclude Include="..\..\src\core\profiling\timers.h" /> -<<<<<<< HEAD -======= - <ClInclude Include="..\..\src\core\profiling\timers_preciseclock.h" /> <ClInclude Include="..\..\src\core\statistics\census_interface.h" /> <ClInclude Include="..\..\src\core\statistics\census_rpc_stats.h" /> ->>>>>>> upstream/master <ClInclude Include="..\..\src\core\surface\byte_buffer_queue.h" /> <ClInclude Include="..\..\src\core\surface\call.h" /> <ClInclude Include="..\..\src\core\surface\channel.h" /> diff --git a/vsprojects/grpc/grpc.vcxproj.filters b/vsprojects/grpc/grpc.vcxproj.filters index b858f51e96..b22818aebd 100644 --- a/vsprojects/grpc/grpc.vcxproj.filters +++ b/vsprojects/grpc/grpc.vcxproj.filters @@ -680,18 +680,12 @@ <ClInclude Include="..\..\src\core\profiling\timers.h"> <Filter>src\core\profiling</Filter> </ClInclude> -<<<<<<< HEAD -======= - <ClInclude Include="..\..\src\core\profiling\timers_preciseclock.h"> - <Filter>src\core\profiling</Filter> - </ClInclude> <ClInclude Include="..\..\src\core\statistics\census_interface.h"> <Filter>src\core\statistics</Filter> </ClInclude> <ClInclude Include="..\..\src\core\statistics\census_rpc_stats.h"> <Filter>src\core\statistics</Filter> </ClInclude> ->>>>>>> upstream/master <ClInclude Include="..\..\src\core\surface\byte_buffer_queue.h"> <Filter>src\core\surface</Filter> </ClInclude> diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj index ed66d6c570..3883a328e0 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj @@ -290,12 +290,8 @@ <ClInclude Include="..\..\src\core\json\json_reader.h" /> <ClInclude Include="..\..\src\core\json\json_writer.h" /> <ClInclude Include="..\..\src\core\profiling\timers.h" /> -<<<<<<< HEAD -======= - <ClInclude Include="..\..\src\core\profiling\timers_preciseclock.h" /> <ClInclude Include="..\..\src\core\statistics\census_interface.h" /> <ClInclude Include="..\..\src\core\statistics\census_rpc_stats.h" /> ->>>>>>> upstream/master <ClInclude Include="..\..\src\core\surface\byte_buffer_queue.h" /> <ClInclude Include="..\..\src\core\surface\call.h" /> <ClInclude Include="..\..\src\core\surface\channel.h" /> diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters index 77216c1977..d12abc0ad7 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -578,18 +578,12 @@ <ClInclude Include="..\..\src\core\profiling\timers.h"> <Filter>src\core\profiling</Filter> </ClInclude> -<<<<<<< HEAD -======= - <ClInclude Include="..\..\src\core\profiling\timers_preciseclock.h"> - <Filter>src\core\profiling</Filter> - </ClInclude> <ClInclude Include="..\..\src\core\statistics\census_interface.h"> <Filter>src\core\statistics</Filter> </ClInclude> <ClInclude Include="..\..\src\core\statistics\census_rpc_stats.h"> <Filter>src\core\statistics</Filter> </ClInclude> ->>>>>>> upstream/master <ClInclude Include="..\..\src\core\surface\byte_buffer_queue.h"> <Filter>src\core\surface</Filter> </ClInclude> |