From 0f1a72e26b29905674db88044f91376c39d3ea78 Mon Sep 17 00:00:00 2001 From: Tom Haile Date: Mon, 18 Sep 2023 15:17:13 -0500 Subject: [PATCH] fix merge conflict in test --- internal/transactions/transactions_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/transactions/transactions_test.go b/internal/transactions/transactions_test.go index 2f7cc4743..ff5a6f5b1 100644 --- a/internal/transactions/transactions_test.go +++ b/internal/transactions/transactions_test.go @@ -401,7 +401,6 @@ Events: Code (hidden, use --include code) - Payload (hidden, use --include payload) Fee Events (hidden, use --include fee-events)`, output.OkEmoji()), "\n")