synced with main

go.mod

@@ -11,22 +11,12 @@ require (
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/rs/zerolog v1.29.1
 	github.com/shopspring/decimal v1.3.1
-<<<<<<< HEAD
 	github.com/stretchr/testify v1.8.4
 	github.com/trisacrypto/directory v1.7.3
 	github.com/trisacrypto/trisa v0.99999.1
 	github.com/urfave/cli v1.22.14
-	github.com/xplorfin/lnurlauth v0.60.0
 	google.golang.org/grpc v1.57.0
 	google.golang.org/protobuf v1.31.0
-=======
-	github.com/stretchr/testify v1.8.3
-	github.com/trisacrypto/directory v1.3.1
-	github.com/trisacrypto/trisa v0.3.6
-	github.com/urfave/cli v1.22.5
-	google.golang.org/grpc v1.56.0
-	google.golang.org/protobuf v1.30.0
->>>>>>> origin
 	gorm.io/driver/postgres v1.5.2
 	gorm.io/gorm v1.25.0
 )
@@ -63,11 +53,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rotationalio/go-ensign v0.9.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-<<<<<<< HEAD
-	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-=======
->>>>>>> origin
 	github.com/tidwall/gjson v1.9.3 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect