fix: merge

charmbracelet · Oct 26, 2023 · b4144b4 · b4144b4
1 parent 0ac980e
commit b4144b4
Showing 1 changed file with 0 additions and 6 deletions.
diff --git 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)
 }