From 2cd79bf3a8fd09c1df3dbc92a279a91a75896035 Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Thu, 7 Apr 2016 14:26:59 -0700
Subject: Removed duplicated operator delete from merge conflict.

---
 src/google/protobuf/dynamic_message.cc | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/google/protobuf/dynamic_message.cc')

diff --git a/src/google/protobuf/dynamic_message.cc b/src/google/protobuf/dynamic_message.cc
index 6792dc0d..9e83bd29 100644
--- a/src/google/protobuf/dynamic_message.cc
+++ b/src/google/protobuf/dynamic_message.cc
@@ -253,12 +253,6 @@ class DynamicMessage : public Message {
   DynamicMessage(const TypeInfo* type_info);
   ~DynamicMessage();
 
-#ifndef _MSC_VER
-  void operator delete(void *p) {
-    ::operator delete(p); // non-sized deallocation
-  }
-#endif
-
   // Called on the prototype after construction to initialize message fields.
   void CrossLinkPrototypes();
 
-- 
cgit v1.2.3