diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-26 20:35:35 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-26 20:35:35 -0700 |
| commit | fcdcf88d8a4be7e16733f412d74b6cbcff2411de (patch) | |
| tree | ef778893e1ba7eb8aa007a4a47b5b8e37bc56ac6 | |
| parent | f900837afa9d2959d1e3134c531ddc1d4c9c9826 (diff) | |
| download | protobuf-fcdcf88d8a4be7e16733f412d74b6cbcff2411de.tar.gz protobuf-fcdcf88d8a4be7e16733f412d74b6cbcff2411de.tar.bz2 protobuf-fcdcf88d8a4be7e16733f412d74b6cbcff2411de.zip | |
Fix merge conflict.
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index a291f7ad..82ce190d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -481,7 +481,6 @@ objectivec_EXTRA_DIST= \ objectivec/Tests/text_format_map_unittest_data.txt \ objectivec/Tests/text_format_unittest_data.txt \ objectivec/Tests/unittest_cycle.proto \ - objectivec/Tests/unittest_objc_startup.proto \ objectivec/Tests/unittest_objc.proto \ objectivec/Tests/unittest_objc_startup.proto \ objectivec/Tests/unittest_runtime_proto2.proto \ |