From 1e435e627a2e40fadd6ddc8cbb771a8b61fb29e6 Mon Sep 17 00:00:00 2001 From: joshemb <josh@elixxir.io> Date: Tue, 27 Jun 2023 09:31:51 -0700 Subject: [PATCH] Resolve conflicts --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 229a073..deecd1f 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/spf13/cobra v1.7.0 github.com/spf13/jwalterweatherman v1.1.0 github.com/stretchr/testify v1.8.2 - gitlab.com/elixxir/client/v4 v4.6.4-0.20230626174341-9991c0c1c379 + gitlab.com/elixxir/client/v4 v4.6.4-0.20230626170549-46d4f5259a86 gitlab.com/elixxir/crypto v0.0.7-0.20230614183801-387e0cb8e76f gitlab.com/elixxir/primitives v0.0.3-0.20230613193928-8cf8bdd777ef gitlab.com/elixxir/wasm-utils v0.0.0-20230615222914-185dd3a6fa08 diff --git a/go.sum b/go.sum index 8a01c01..969cc28 100644 --- a/go.sum +++ b/go.sum @@ -519,6 +519,8 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= gitlab.com/elixxir/bloomfilter v0.0.0-20230322223210-fa84f6842de8 h1:uAFCyBkXprQoPkcDDfxXtaMyL5x+xSGrAWzR907xROQ= gitlab.com/elixxir/bloomfilter v0.0.0-20230322223210-fa84f6842de8/go.mod h1:1X8gRIAPDisS3W6Vtr/ymiUmZMJUIwDV1o5DEOo/pzw= +gitlab.com/elixxir/client/v4 v4.6.4-0.20230626170549-46d4f5259a86 h1:of599FYjvUmCq/HvaZ1YnY01Emrm+jaWzYnbRIgHph0= +gitlab.com/elixxir/client/v4 v4.6.4-0.20230626170549-46d4f5259a86/go.mod h1:wSeJ9pk+qqUrKHwhd4qZW1CnNlakK75n+1fOjJ7k1Ns= gitlab.com/elixxir/client/v4 v4.6.4-0.20230626174341-9991c0c1c379 h1:dv3/sCyBv439ulpN394pgN8AYNb67nvC6aP90dGOqm8= gitlab.com/elixxir/client/v4 v4.6.4-0.20230626174341-9991c0c1c379/go.mod h1:wSeJ9pk+qqUrKHwhd4qZW1CnNlakK75n+1fOjJ7k1Ns= gitlab.com/elixxir/comms v0.0.4-0.20230613220741-7de1d2ca4a1c h1:0TpLn4AdarrqCwUMvnz4Md+9gLyk9wrQ73J3W9U5zJo= -- GitLab