resolve merge conflict in cmd/jira/main.go

cmd/jira/main.go

@@ -3,12 +3,14 @@ package main
 import (
 	"os"
 	"path/filepath"
+	"reflect"
 
 	"github.com/coryb/figtree"
 	"github.com/coryb/oreo"
 
 	"github.com/go-jira/jira/jiracli"
 	"github.com/go-jira/jira/jiracmd"
+	"gopkg.in/coryb/yaml.v2"
 	"gopkg.in/op/go-logging.v1"
 )
 
@@ -28,6 +30,10 @@ func main() {
 	jiracli.InitLogging()
 
 	configDir := ".jira.d"
+
+	yaml.UseMapType(reflect.TypeOf(map[string]interface{}{}))
+	defer yaml.RestoreMapType()
+
 	fig := figtree.NewFigTree(
 		figtree.WithHome(jiracli.Homedir()),
 		figtree.WithEnvPrefix("JIRA"),

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
 	github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
-	github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df
+	github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d
 	github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e
 	github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1
 	github.com/davecgh/go-spew v1.1.0 // indirect

go.sum

@@ -8,6 +8,8 @@ github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitf
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
 github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df h1:cS4Z9Nlv8J4UqFbLp9ltZypgenm2p3Jeg0yqLfpH2pc=
 github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df/go.mod h1:uAkZUEGm6dROpxfy+8vXLs7JrLCI4O+gQyKAuISxI/g=
+github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d h1:99xxg8FYj+5TYg88DxA4xL8ODuI6OvuSu35WQOVPDPg=
+github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d/go.mod h1:uAkZUEGm6dROpxfy+8vXLs7JrLCI4O+gQyKAuISxI/g=
 github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e h1:tGmk9Tuyz7fKuBq/d3nFJvVWRvc48MEBKQC4uYV3wb0=
 github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e/go.mod h1:gBc0uEH6swbOMoR7VkVuW7w5fGvZu/KHeSgxBR4Ta7Q=
 github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1 h1:Hh0qSvmvoAGL8VxvEoUv9UuUf9XlKcQtSxAMTz1kqfE=