fix rebase

Signed-off-by: He Jie Xu <hejie.xu@intel.com>
soulxu · Nov 23, 2023 · ab8fa48 · ab8fa48
1 parent 3b701c5
commit ab8fa48
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/source/common/buffer/buffer_impl.h b/source/common/buffer/buffer_impl.h
@@ -318,13 +318,9 @@ class Slice {
   void transferDrainTrackersTo(Slice& destination) {
     destination.drain_trackers_.splice(destination.drain_trackers_.end(), drain_trackers_);
     ASSERT(drain_trackers_.empty());
-<<<<<<< HEAD
     // The releasor needn't to be transferred, and actually if there is releasor, this
     // slice can't coalesce. Then there won't be a chance to calling this method.
     ASSERT(releasor_ == nullptr);
-=======
-    destination.releasor_.swap(releasor_);
->>>>>>> a9947e47f9 (Move io_uring interface header file to "envoy/" directory)
   }
 
   /**