Skip to content

Commit 6e2a9aa

Browse files
committed
resolve conflict in go.mod and go.sum file
Signed-off-by: NAVEENA S <[email protected]>
2 parents dbb2cc0 + c5bfe84 commit 6e2a9aa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.6
55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765
77
github.com/argoproj-labs/argocd-image-updater v1.0.1
8-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20251121134311-a751ff8235fc
8+
github.com/argoproj-labs/argocd-operator v0.0.0-20251125104336-a68322dd72f3
99
github.com/argoproj/argo-cd/v3 v3.1.9
1010
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec
1111
github.com/go-logr/logr v1.4.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7
3333
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0=
3434
github.com/argoproj-labs/argocd-image-updater v1.0.1 h1:g6WRF33TQ0/CPDndbC97oP0aEqJMEesQenz0Cz8F6XQ=
3535
github.com/argoproj-labs/argocd-image-updater v1.0.1/go.mod h1:PJ+Pb3faVqSzNNs35INUZYtzlaqKvBE2ZgZGdDabJQM=
36-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20251121134311-a751ff8235fc h1:nO/RRc7JathZOnfXsbDYSy56jkDGluyKfmBJg5kZBrw=
37-
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20251121134311-a751ff8235fc/go.mod h1:tugRb82zAQXSsQfogeBkNUfl5ffdPAAD5nk/9eRAUC8=
36+
github.com/argoproj-labs/argocd-operator v0.0.0-20251125104336-a68322dd72f3 h1:rhNi/GnlHjJWyE3ivayCSDZfvRvoxUgHoH2sEgTuyv4=
37+
github.com/argoproj-labs/argocd-operator v0.0.0-20251125104336-a68322dd72f3/go.mod h1:tugRb82zAQXSsQfogeBkNUfl5ffdPAAD5nk/9eRAUC8=
3838
github.com/argoproj/argo-cd/v3 v3.1.9 h1:9P9vJKo1RGWu6mtQnGu61r+0h3XKlA2j3kVhwogUQ/0=
3939
github.com/argoproj/argo-cd/v3 v3.1.9/go.mod h1:ZHb/LOz/hr88VWMJiVTd8DGYL7MheHCAT8S6DgYOBFo=
4040
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec h1:rNAwbRQFvRIuW/e2bU+B10mlzghYXsnwZedYeA7Drz4=

0 commit comments

Comments
 (0)