From b4144b475cddccc62732f6a44fbd939dff9e9d4c Mon Sep 17 00:00:00 2001
From: Ayman Bagabas <ayman.bagabas@gmail.com>
Date: Thu, 26 Oct 2023 16:27:22 -0400
Subject: [PATCH] fix: merge

---
 transfer/batch.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/transfer/batch.go b/transfer/batch.go
index bcaf0ef..6f590a2 100644
--- a/transfer/batch.go
+++ b/transfer/batch.go
@@ -9,10 +9,4 @@ type BatchItem struct {
 
 	// Args is an optional oid-line key-value pairs.
 	Args Args
-<<<<<<< HEAD
-=======
-
-	// Error is an optional error message.
-	Error string
->>>>>>> 29d6979f6467 (feat: support batch response error message)
 }