From fcdcf88d8a4be7e16733f412d74b6cbcff2411de Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Wed, 26 Aug 2015 20:35:35 -0700 Subject: Fix merge conflict. --- Makefile.am | 1 - 1 file changed, 1 deletion(-) 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 \ -- cgit v1.2.3