Fix merge conflict.

wutaozhao · Aug 27, 2015 · fcdcf88 · fcdcf88
1 parent f900837
commit fcdcf88
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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                              \