Removed duplicated operator delete from merge conflict.
Removed duplicated operator delete from merge conflict.

google/protobuf,google/protobuf,google/protobuf,Livefyre/protobuf,google/protobuf,Livefyre/protobuf,google/protobuf,Livefyre/protobuf,Livefyre/protobuf,google/protobuf,google/protobuf,google/protobuf,google/protobuf,google/protobuf,google/protobuf,Livefyre/protobuf