diff options
| author |  yang-g <yangg@google.com> | 2016-04-26 16:23:53 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-04-26 16:23:53 -0700 |
| commit | 6b16aaae96d7f8664870da8b4e36ea0da10d667e (patch) | |
| tree | d3b6915ba019bae703f6e6d87351a454be2a3aba /config.m4 | |
| parent | 57d1e082689c96e2721122748b08583d6b63d394 (diff) | |
| parent | a4e7ecab1a512bae1c40b9b301661ba24677b0ed (diff) | |
merge and resolve conflict
Diffstat (limited to 'config.m4')
| -rw-r--r-- | config.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -80,6 +80,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/support/tmpfile_posix.c \ src/core/lib/support/tmpfile_win32.c \ src/core/lib/support/wrap_memcpy.c \ + src/core/lib/surface/init.c \ src/core/lib/channel/channel_args.c \ src/core/lib/channel/channel_stack.c \ src/core/lib/channel/channel_stack_builder.c \ @@ -149,7 +150,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/surface/channel_stack_type.c \ src/core/lib/surface/completion_queue.c \ src/core/lib/surface/event_string.c \ - src/core/lib/surface/init.c \ src/core/lib/surface/lame_client.c \ src/core/lib/surface/metadata_array.c \ src/core/lib/surface/server.c \ |