fix conflict

crypto-org-chain · Mar 26, 2024 · 2bd87a7 · 2bd87a7
1 parent f97acc9
commit 2bd87a7
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/app/app.go b/app/app.go
@@ -1,13 +1,10 @@
 package app
 
 import (
-<<<<<<< HEAD
-	stderrors "errors"
-=======
 	"crypto/sha256"
 	"encoding/hex"
 	"errors"
->>>>>>> c007e115 (Problem: black list addresses are not logged (#1328))
+	stderrors "errors"
 	"fmt"
 	"io"
 	"io/fs"