Skip to content

P
protobuf
Commit fcdcf88d authored by Feng Xiao's avatar Feng Xiao
Browse files
Options

Fix merge conflict.

parent f900837a
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
Makefile.am
View file @ fcdcf88d
......@@ -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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment