projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '21815-trigrams-exclude-ids'
[arvados.git]
/
lib
/
config
/
load.go
diff --git
a/lib/config/load.go
b/lib/config/load.go
index 00c8e286832f0f0c3a593c41cf08e919a054ad32..93c175062e896cdea74669f21df28358129e489e 100644
(file)
--- a/
lib/config/load.go
+++ b/
lib/config/load.go
@@
-21,9
+21,9
@@
import (
"strings"
"time"
+ "dario.cat/mergo"
"git.arvados.org/arvados.git/sdk/go/arvados"
"github.com/ghodss/yaml"
- "github.com/imdario/mergo"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"