From b0efa16d061e8ee9e759f0a6cca84099046fb0fc Mon Sep 17 00:00:00 2001 From: rbajollari Date: Fri, 15 Sep 2023 15:51:05 -0400 Subject: [PATCH] fix conflicts --- go.mod | 5 ----- go.sum | 5 ----- 2 files changed, 10 deletions(-) diff --git a/go.mod b/go.mod index 54510ab7..4d7c14aa 100644 --- a/go.mod +++ b/go.mod @@ -13,13 +13,8 @@ require ( github.com/hasura/go-graphql-client v0.10.0 github.com/justinas/alice v1.2.0 github.com/mitchellh/mapstructure v1.5.0 -<<<<<<< HEAD github.com/ojo-network/ojo v0.1.2 - github.com/rs/cors v1.9.0 -======= - github.com/ojo-network/ojo v0.2.0 github.com/rs/cors v1.10.0 ->>>>>>> 63a5e89 (build(deps): Bump github.com/rs/cors from 1.9.0 to 1.10.0 (#257)) github.com/rs/zerolog v1.30.0 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 diff --git a/go.sum b/go.sum index d6af3efb..2c6a3148 100644 --- a/go.sum +++ b/go.sum @@ -1257,14 +1257,9 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -<<<<<<< HEAD github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= -github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -======= github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8= github.com/rs/cors v1.10.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= ->>>>>>> 63a5e89 (build(deps): Bump github.com/rs/cors from 1.9.0 to 1.10.0 (#257)) github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=