fix merge conflicts

SiaFoundation · Sep 25, 2024 · 20dcce9 · 20dcce9
1 parent 218ea04
commit 20dcce9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -4,8 +4,6 @@ go 1.23.0
 
 require (
 	github.com/mattn/go-sqlite3 v1.14.23
-	go.sia.tech/core v0.4.6
-	go.sia.tech/coreutils v0.3.3-0.20240919173455-7fd91e1c4791
 	go.sia.tech/jape v0.12.1
 	go.uber.org/zap v1.27.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -20,10 +18,12 @@ require (
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/stretchr/testify v1.8.3 // indirect
 	go.etcd.io/bbolt v1.3.11 // indirect
+	go.sia.tech/core v0.4.6 // indirect
+	go.sia.tech/coreutils v0.3.3-0.20240919173455-7fd91e1c4791 // indirect
 	go.sia.tech/mux v1.3.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/tools v0.20.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
-)
+)
diff --git a/go.sum b/go.sum
@@ -23,6 +23,8 @@ go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
 go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
 go.sia.tech/core v0.4.6 h1:QLm97a7GWBonfnMEOokqWRAqsWCUPL7kzo6k3Adwx8E=
 go.sia.tech/core v0.4.6/go.mod h1:Zuq0Tn2aIXJyO0bjGu8cMeVWe+vwQnUfZhG1LCmjD5c=
+go.sia.tech/coreutils v0.3.3-0.20240903190934-0dd7ac18e90f h1:qCHhdAMSbI7aku94q6a90Jj5adXQA5BSeMhag6lz9xk=
+go.sia.tech/coreutils v0.3.3-0.20240903190934-0dd7ac18e90f/go.mod h1:woPVmN6GUpIKHdi71Hkb9goIbl7b45TquCsAyEzyxnI=
 go.sia.tech/coreutils v0.3.3-0.20240919173455-7fd91e1c4791 h1:A0r5QkLysdiVHq0FV28JU0F5QZDUnjG/HSLBcjjqgp4=
 go.sia.tech/coreutils v0.3.3-0.20240919173455-7fd91e1c4791/go.mod h1:Y7L4NIozE9EyjrzY+e/vXog7o3wREu9e2POXFDsdnVE=
 go.sia.tech/jape v0.12.1 h1:xr+o9V8FO8ScRqbSaqYf9bjj1UJ2eipZuNcI1nYousU=
@@ -54,4 +56,4 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw=
 lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s=
 lukechampine.com/upnp v0.3.0 h1:UVCD6eD6fmJmwak6DVE3vGN+L46Fk8edTcC6XYCb6C4=
-lukechampine.com/upnp v0.3.0/go.mod h1:sOuF+fGSDKjpUm6QI0mfb82ScRrhj8bsqsD78O5nK1k=
+lukechampine.com/upnp v0.3.0/go.mod h1:sOuF+fGSDKjpUm6QI0mfb82ScRrhj8bsqsD78O5nK1k=