From 906639ad7eb92e9d631599f78979908930e59c84 Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:54:30 +0000
Subject: [chore] update viper version (#2539)

* update viper version

* removes our last uses of the slice package

* fix tests
---
 .../sourcegraph/conc/internal/multierror/multierror_go119.go   | 10 ++++++++++
 .../sourcegraph/conc/internal/multierror/multierror_go120.go   | 10 ++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go
 create mode 100644 vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go

(limited to 'vendor/github.com/sourcegraph/conc/internal')

diff --git a/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go
new file mode 100644
index 000000000..7087e32a8
--- /dev/null
+++ b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go119.go
@@ -0,0 +1,10 @@
+//go:build !go1.20
+// +build !go1.20
+
+package multierror
+
+import "go.uber.org/multierr"
+
+var (
+	Join = multierr.Combine
+)
diff --git a/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go
new file mode 100644
index 000000000..39cff829a
--- /dev/null
+++ b/vendor/github.com/sourcegraph/conc/internal/multierror/multierror_go120.go
@@ -0,0 +1,10 @@
+//go:build go1.20
+// +build go1.20
+
+package multierror
+
+import "errors"
+
+var (
+	Join = errors.Join
+)
-- 
cgit v1.3