diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 31a582105..deafa5b80 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,7 @@ jobs: tests-off: - name: (GOPATH) ${{matrix.go-version}} ${{matrix.os}} + name: ${{matrix.go-version}} ${{matrix.os}} runs-on: ${{ matrix.os }} strategy: matrix: @@ -19,8 +19,6 @@ jobs: fetch-depth: 1 path: src/github.com/${{ github.repository }} - name: Test - env: - GOPATH: ${{runner.workspace}} run: | go mod tidy -v go test -tags "sqlite integration_test" -cover -race ./... diff --git a/Dockerfile b/Dockerfile index 2939ae24c..c60090f43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,16 @@ FROM gobuffalo/buffalo:latest -ENV GOPROXY=https://proxy.golang.org ARG CODECOV_TOKEN -ENV BP=$GOPATH/src/github.com/gobuffalo/buffalo +ENV GOPROXY https://proxy.golang.org +ENV GO111MODULE on +ENV BP /src/buffalo + RUN rm -rf $BP RUN mkdir -p $BP -WORKDIR $BP +WORKDIR $BP COPY . . -RUN bash ./it.sh + +RUN go mod tidy +RUN go test -tags "sqlite integration_test" -cover -race -v ./... diff --git a/Makefile b/Makefile index 9839789bb..05f8778f0 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ build: test: $(GO_BIN) test -tags ${TAGS} -cover ./... + packr2 make tidy ci-deps: diff --git a/buffalo/cmd/plugins/available.go b/buffalo/cmd/plugins/available.go index bc0ed2c36..a95078d00 100644 --- a/buffalo/cmd/plugins/available.go +++ b/buffalo/cmd/plugins/available.go @@ -18,11 +18,9 @@ var PluginsCmd = &cobra.Command{ func init() { PluginsCmd.AddCommand(addCmd) PluginsCmd.AddCommand(listCmd) - PluginsCmd.AddCommand(generateCmd) PluginsCmd.AddCommand(removeCmd) PluginsCmd.AddCommand(installCmd) PluginsCmd.AddCommand(cacheCmd) - Available.Add("generate", generateCmd) Available.ListenFor("buffalo:setup:.+", Listen) } diff --git a/buffalo/cmd/plugins/generate.go b/buffalo/cmd/plugins/generate.go deleted file mode 100644 index 4d200be32..000000000 --- a/buffalo/cmd/plugins/generate.go +++ /dev/null @@ -1,80 +0,0 @@ -package plugins - -import ( - "context" - "fmt" - "path/filepath" - "strings" - - "github.com/gobuffalo/buffalo/genny/plugins/plugin" - "github.com/gobuffalo/buffalo/genny/plugins/plugin/with" - "github.com/gobuffalo/envy" - "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/gogen" - "github.com/gobuffalo/licenser/genny/licenser" - "github.com/gobuffalo/logger" - "github.com/spf13/cobra" - "github.com/spf13/viper" -) - -// generateCmd represents the generate command -var generateCmd = &cobra.Command{ - Use: "plugin", - Short: "generates a new buffalo plugin", - Long: "buffalo generate plugin github.com/foo/buffalo-bar", - RunE: func(cmd *cobra.Command, args []string) error { - popts := &plugin.Options{ - Author: viper.GetString("author"), - ShortName: viper.GetString("short-name"), - License: viper.GetString("license"), - } - if len(args) > 0 { - popts.PluginPkg = args[0] - } - - r := genny.WetRunner(context.Background()) - if viper.GetBool("dry-run") { - r = genny.DryRunner(context.Background()) - } - - popts.Root = filepath.Join(envy.GoPath(), "src") - - gg, err := plugin.New(popts) - if err != nil { - return err - } - r.Root = popts.Root - r.WithRun(genny.Force(r.Root, viper.GetBool("force"))) - r.WithGroup(gg) - - if viper.GetBool("with-gen") { - gg, err := with.GenerateCmd(popts) - if err != nil { - return err - } - r.WithGroup(gg) - } - - g, err := gogen.Fmt(r.Root) - if err != nil { - return err - } - r.With(g) - - if viper.GetBool("verbose") { - r.Logger = logger.New(logger.DebugLevel) - } - return r.Run() - }, -} - -func init() { - generateCmd.Flags().BoolP("dry-run", "d", false, "run the generator without creating files or running commands") - generateCmd.Flags().BoolP("verbose", "v", false, "turn on verbose logging") - generateCmd.Flags().Bool("with-gen", false, "creates a generator plugin") - generateCmd.Flags().BoolP("force", "f", false, "will delete the target directory if it exists") - generateCmd.Flags().StringP("author", "a", "", "author's name") - generateCmd.Flags().StringP("license", "l", "mit", fmt.Sprintf("choose a license from: [%s]", strings.Join(licenser.Available, ", "))) - generateCmd.Flags().StringP("short-name", "s", "", "a 'short' name for the package") - viper.BindPFlags(generateCmd.Flags()) -} diff --git a/genny/build/bin.go b/genny/build/bin.go index e95d70330..b2888c3b7 100644 --- a/genny/build/bin.go +++ b/genny/build/bin.go @@ -6,7 +6,6 @@ import ( "strings" "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/gogen/gomods" ) func buildCmd(opts *Options) (*exec.Cmd, error) { @@ -15,10 +14,6 @@ func buildCmd(opts *Options) (*exec.Cmd, error) { } buildArgs := []string{opts.GoCommand} - if !gomods.On() { - buildArgs = append(buildArgs, "-i") - } - if len(opts.Mod) != 0 { buildArgs = append(buildArgs, "-mod", opts.Mod) } diff --git a/genny/build/build_test.go b/genny/build/build_test.go index 6b1725487..b82be2138 100644 --- a/genny/build/build_test.go +++ b/genny/build/build_test.go @@ -58,7 +58,7 @@ func Test_New(t *testing.T) { // we should never leave any files modified or dropped r.Len(res.Files, 0) - cmds := []string{"go get -tags bar ./...", "go build -i -tags bar -o bin/foo"} + cmds := []string{"go get -tags bar ./...", "go build -tags bar -o bin/foo"} r.Len(res.Commands, len(cmds)) for i, c := range res.Commands { eq(r, cmds[i], c) @@ -87,7 +87,7 @@ func Test_NewWithoutBuildDeps(t *testing.T) { res := run.Results() - cmds := []string{"go build -i -tags bar -o bin/foo"} + cmds := []string{"go build -tags bar -o bin/foo"} r.Len(res.Commands, len(cmds)) for i, c := range res.Commands { eq(r, cmds[i], c) diff --git a/genny/docker/templates/multi/Dockerfile.tmpl b/genny/docker/templates/multi/Dockerfile.tmpl index a9473f4dc..90c836c21 100644 --- a/genny/docker/templates/multi/Dockerfile.tmpl +++ b/genny/docker/templates/multi/Dockerfile.tmpl @@ -2,6 +2,9 @@ # https://docs.docker.com/engine/userguide/eng-image/multistage-build/ FROM gobuffalo/buffalo:{{.opts.Version}} as builder +ENV GO111MODULE on +ENV GOPROXY http://proxy.golang.org + RUN mkdir -p $GOPATH/src/{{.opts.App.PackagePkg}} WORKDIR $GOPATH/src/{{.opts.App.PackagePkg}} @@ -17,10 +20,6 @@ RUN npm install --no-progress {{end -}} ADD . . -{{if .opts.App.WithModules -}} -ENV GO111MODULE=on -{{end -}} -RUN go get ./... RUN buffalo build --static -o /bin/app FROM alpine diff --git a/genny/docker/templates/standard/Dockerfile.tmpl b/genny/docker/templates/standard/Dockerfile.tmpl index 61b78a144..8017e533f 100644 --- a/genny/docker/templates/standard/Dockerfile.tmpl +++ b/genny/docker/templates/standard/Dockerfile.tmpl @@ -1,5 +1,8 @@ FROM gobuffalo/buffalo:{{.opts.Version}} +ENV GO111MODULE on +ENV GOPROXY http://proxy.golang.org + RUN mkdir -p $GOPATH/src/{{.opts.App.PackagePkg}} WORKDIR $GOPATH/src/{{.opts.App.PackagePkg}} @@ -17,7 +20,6 @@ RUN npm install --no-progress {{end -}} ADD . . -RUN go get $(go list ./... | grep -v /vendor/) RUN buffalo build --static -o /bin/app # Uncomment to run the binary in "production" mode: diff --git a/genny/newapp/api/api.go b/genny/newapp/api/api.go index c1c6fccc8..e12b73dff 100644 --- a/genny/newapp/api/api.go +++ b/genny/newapp/api/api.go @@ -6,7 +6,6 @@ import ( "github.com/gobuffalo/buffalo/genny/newapp/core" "github.com/gobuffalo/genny" "github.com/gobuffalo/genny/gogen" - "github.com/gobuffalo/genny/gogen/gomods" "github.com/gobuffalo/packr/v2" ) @@ -34,20 +33,5 @@ func New(opts *Options) (*genny.Group, error) { gg.Add(g) - // DEP/MODS/go get should be last - if !opts.App.WithModules { - g := genny.New() - g.Command(gogen.Get("./...", "-t")) - gg.Add(g) - } - - if opts.App.WithModules { - g, err := gomods.Tidy(opts.App.Root, false) - if err != nil { - return gg, err - } - gg.Add(g) - } - return gg, nil } diff --git a/genny/newapp/api/api_test.go b/genny/newapp/api/api_test.go index d47c57f51..12549139c 100644 --- a/genny/newapp/api/api_test.go +++ b/genny/newapp/api/api_test.go @@ -19,7 +19,8 @@ func init() { func Test_New(t *testing.T) { r := require.New(t) - app := meta.New(".") + app := meta.Named("api", ".") + (&app).PackageRoot("api") app.WithModules = false app.AsAPI = true app.AsWeb = false @@ -39,8 +40,7 @@ func Test_New(t *testing.T) { res := run.Results() cmds := []string{ - "go get -t ./...", - "go get -t ./...", + "go mod init api", } r.Len(res.Commands, len(cmds)) diff --git a/genny/newapp/core/core.go b/genny/newapp/core/core.go index 557c00621..79f2e73ed 100644 --- a/genny/newapp/core/core.go +++ b/genny/newapp/core/core.go @@ -8,10 +8,7 @@ import ( "github.com/gobuffalo/buffalo/genny/refresh" "github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx" "github.com/gobuffalo/buffalo/plugins/plugdeps" - "github.com/gobuffalo/buffalo/runtime" "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/gogen" - "github.com/gobuffalo/genny/gogen/gomods" "github.com/gobuffalo/meta" ) @@ -28,17 +25,6 @@ func New(opts *Options) (*genny.Group, error) { app := opts.App - if app.WithModules { - g, err := gomods.Init(app.PackagePkg, app.Root) - if err != nil { - return gg, err - } - g.Command(gogen.Get("github.com/gobuffalo/buffalo@" + runtime.Version)) - g.Command(gogen.Get("./...")) - - gg.Add(g) - } - plugs, err := plugdeps.List(app) if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) { return nil, err @@ -102,19 +88,5 @@ func New(opts *Options) (*genny.Group, error) { } gg.Merge(ig) - if !app.WithModules { - g := genny.New() - g.Command(gogen.Get("./...", "-t")) - gg.Add(g) - } - - if app.WithModules { - g, err := gomods.Tidy(app.Root, false) - if err != nil { - return gg, err - } - gg.Add(g) - } - return gg, nil } diff --git a/genny/newapp/core/core_test.go b/genny/newapp/core/core_test.go index 7d6af3b4c..20aec8003 100644 --- a/genny/newapp/core/core_test.go +++ b/genny/newapp/core/core_test.go @@ -1,16 +1,12 @@ package core import ( - "path/filepath" "testing" "github.com/gobuffalo/buffalo/genny/docker" - "github.com/gobuffalo/buffalo/runtime" "github.com/gobuffalo/envy" "github.com/gobuffalo/genny/gentest" - "github.com/gobuffalo/logger" "github.com/gobuffalo/meta" - "github.com/gobuffalo/packr/v2/plog" "github.com/stretchr/testify/require" ) @@ -20,56 +16,6 @@ func init() { } func Test_New(t *testing.T) { - r := require.New(t) - plog.Logger = logger.New(logger.DebugLevel) - app := meta.Named("coke", filepath.Join(envy.GoPath(), "src")) - app.WithModules = false - - gg, err := New(&Options{ - App: app, - }) - r.NoError(err) - - run := gentest.NewRunner() - run.WithGroup(gg) - - r.NoError(run.Run()) - - res := run.Results() - - cmds := []string{ - "go get -t ./...", - } - r.NoError(gentest.CompareCommands(cmds, res.Commands)) - - expected := commonExpected - for _, e := range expected { - _, err = res.Find(e) - r.NoError(err) - } - - f, err := res.Find("actions/render.go") - r.NoError(err) - - body := f.String() - r.Contains(body, `r = render.New(render.Options{})`) - unexpected := []string{ - "Dockerfile", - "database.yml", - "models/models.go", - "go.mod", - ".buffalo.dev.yml", - "assets/css/application.scss.css", - "public/assets/application.js", - } - - for _, u := range unexpected { - _, err = res.Find(u) - r.Error(err) - } -} - -func Test_New_Mods(t *testing.T) { r := require.New(t) envy.Temp(func() { envy.Set(envy.GO111MODULE, "on") @@ -92,9 +38,6 @@ func Test_New_Mods(t *testing.T) { cmds := []string{ "go mod init coke", - "go get github.com/gobuffalo/buffalo@" + runtime.Version, - "go get ./...", - "go mod tidy", } r.NoError(gentest.CompareCommands(cmds, res.Commands)) diff --git a/genny/newapp/core/gopath.go b/genny/newapp/core/gopath.go deleted file mode 100644 index 012e1f4a1..000000000 --- a/genny/newapp/core/gopath.go +++ /dev/null @@ -1,28 +0,0 @@ -package core - -import ( - "os" - "strings" - - "github.com/gobuffalo/genny" -) - -func validateInGoPath(srcDirs []string) genny.RunFn { - return func(r *genny.Runner) error { - pwd, err := os.Getwd() - if err != nil { - return err - } - var found bool - for _, src := range srcDirs { - if strings.Contains(pwd, src) { - found = true - break - } - } - if !found { - return ErrNotInGoPath - } - return nil - } -} diff --git a/genny/newapp/core/gopath_test.go b/genny/newapp/core/gopath_test.go deleted file mode 100644 index 8621d1127..000000000 --- a/genny/newapp/core/gopath_test.go +++ /dev/null @@ -1,22 +0,0 @@ -package core - -import ( - "go/build" - "testing" - - "github.com/gobuffalo/genny/gentest" - "github.com/stretchr/testify/require" -) - -func Test_validateInGoPath(t *testing.T) { - r := require.New(t) - - run := gentest.NewRunner() - - c := build.Default - err := validateInGoPath(c.SrcDirs())(run) - r.NoError(err) - - err = validateInGoPath([]string{"idontexist"})(run) - r.Error(err) -} diff --git a/genny/newapp/core/root.go b/genny/newapp/core/root.go index 6a1e69570..d68488099 100644 --- a/genny/newapp/core/root.go +++ b/genny/newapp/core/root.go @@ -1,11 +1,10 @@ package core import ( - "go/build" "html/template" + "os/exec" "github.com/BurntSushi/toml" - "github.com/gobuffalo/envy" "github.com/gobuffalo/genny" "github.com/gobuffalo/genny/gogen" "github.com/gobuffalo/packr/v2" @@ -19,6 +18,8 @@ func rootGenerator(opts *Options) (*genny.Generator, error) { return g, err } + g.Command(exec.Command("go", "mod", "init", opts.App.PackagePkg)) + g.Transformer(genny.Dot()) // add common templates @@ -35,13 +36,6 @@ func rootGenerator(opts *Options) (*genny.Generator, error) { t := gogen.TemplateTransformer(data, helpers) g.Transformer(t) - if !opts.App.WithModules { - c := build.Default - dirs := c.SrcDirs() - dirs = append(dirs, envy.GoPaths()...) - g.RunFn(validateInGoPath(dirs)) - } - g.RunFn(func(r *genny.Runner) error { f := genny.NewFile("config/buffalo-app.toml", nil) if err := toml.NewEncoder(f).Encode(opts.App); err != nil { diff --git a/genny/newapp/web/web.go b/genny/newapp/web/web.go index bb05b824c..5f75af3cb 100644 --- a/genny/newapp/web/web.go +++ b/genny/newapp/web/web.go @@ -8,7 +8,6 @@ import ( "github.com/gobuffalo/buffalo/genny/newapp/core" "github.com/gobuffalo/genny" "github.com/gobuffalo/genny/gogen" - "github.com/gobuffalo/genny/gogen/gomods" "github.com/gobuffalo/packr/v2" ) @@ -55,20 +54,5 @@ func New(opts *Options) (*genny.Group, error) { gg.Add(g) } - // DEP/MODS/go get should be last - if !opts.App.WithModules { - g := genny.New() - g.Command(gogen.Get("./...", "-t")) - gg.Add(g) - } - - if opts.App.WithModules { - g, err := gomods.Tidy(opts.App.Root, false) - if err != nil { - return gg, err - } - gg.Add(g) - } - return gg, nil } diff --git a/genny/newapp/web/web_test.go b/genny/newapp/web/web_test.go index 80d4ec019..9d5bb0113 100644 --- a/genny/newapp/web/web_test.go +++ b/genny/newapp/web/web_test.go @@ -19,8 +19,10 @@ func init() { func Test_New(t *testing.T) { r := require.New(t) - app := meta.New(".") - app.WithModules = false + app := meta.Named("web", ".") + (&app).PackageRoot("web") + app.WithModules = true + envy.Set(envy.GO111MODULE, "on") gg, err := New(&Options{ Options: &core.Options{ @@ -37,8 +39,7 @@ func Test_New(t *testing.T) { res := run.Results() cmds := []string{ - "go get -t ./...", - "go get -t ./...", + "go mod init web", } r.Len(res.Commands, len(cmds)) diff --git a/genny/plugins/plugin/options.go b/genny/plugins/plugin/options.go deleted file mode 100644 index 36b4e7067..000000000 --- a/genny/plugins/plugin/options.go +++ /dev/null @@ -1,61 +0,0 @@ -package plugin - -import ( - "fmt" - "os/user" - "path" - "path/filepath" - "strings" - "time" -) - -// Options container for passing needed info for -// generating a plugin project. -type Options struct { - PluginPkg string - Year int - Author string - ShortName string - License string - Root string -} - -// Validate makes sure that the options are valid for generator -func (opts *Options) Validate() error { - if opts.PluginPkg == "" { - return fmt.Errorf("plugin has to have a package name") - } - if len(opts.License) == 0 { - opts.License = "mit" - } - - name := path.Base(opts.PluginPkg) - opts.ShortName = strings.TrimPrefix(name, "buffalo-") - if !strings.HasPrefix(name, "buffalo-") { - name = "buffalo-" + name - } - - dir := path.Dir(opts.PluginPkg) - opts.PluginPkg = path.Join(dir, name) - opts.Root = filepath.Join(opts.Root, opts.PluginPkg) - - if opts.Year == 0 { - opts.Year = time.Now().Year() - } - - if len(opts.Author) == 0 { - u, err := user.Current() - if err != nil { - return err - } - if len(u.Name) != 0 { - opts.Author = u.Name - } else if len(u.Username) != 0 { - opts.Author = u.Username - } else { - opts.Author = "unknown" - } - } - - return nil -} diff --git a/genny/plugins/plugin/options_test.go b/genny/plugins/plugin/options_test.go deleted file mode 100644 index f9a649132..000000000 --- a/genny/plugins/plugin/options_test.go +++ /dev/null @@ -1,36 +0,0 @@ -package plugin - -import ( - "os/user" - "testing" - "time" - - "github.com/stretchr/testify/require" -) - -func Test_Options_Validate(t *testing.T) { - r := require.New(t) - - opts := &Options{} - err := opts.Validate() - r.Error(err) - - opts.PluginPkg = "github.com/foo/bar" - - err = opts.Validate() - r.NoError(err) - r.Equal("github.com/foo/buffalo-bar", opts.PluginPkg) - - year := time.Now().Year() - r.Equal(opts.Year, year) - - u, err := user.Current() - r.NoError(err) - if len(u.Name) != 0 { - r.Equal(u.Name, opts.Author) - } else if len(u.Username) != 0 { - r.Equal(u.Username, opts.Author) - } else { - r.Equal("unknown", opts.Author) - } -} diff --git a/genny/plugins/plugin/plugin-packr.go b/genny/plugins/plugin/plugin-packr.go deleted file mode 100644 index e2579e4fb..000000000 --- a/genny/plugins/plugin/plugin-packr.go +++ /dev/null @@ -1,8 +0,0 @@ -// +build !skippackr -// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT. - -// You can use the "packr clean" command to clean up this, -// and any other packr generated files. -package plugin - -import _ "github.com/gobuffalo/buffalo/packrd" diff --git a/genny/plugins/plugin/plugin.go b/genny/plugins/plugin/plugin.go deleted file mode 100644 index d4db84cef..000000000 --- a/genny/plugins/plugin/plugin.go +++ /dev/null @@ -1,57 +0,0 @@ -package plugin - -import ( - "path/filepath" - - "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/plushgen" - "github.com/gobuffalo/licenser/genny/licenser" - "github.com/gobuffalo/packr/v2" - "github.com/gobuffalo/plush" - "github.com/gobuffalo/release/genny/initgen" - "github.com/gobuffalo/release/genny/makefile" -) - -// New generates a plugin project -func New(opts *Options) (*genny.Group, error) { - gg := &genny.Group{} - - if err := opts.Validate(); err != nil { - return gg, err - } - - g := genny.New() - g.Box(packr.New("buffalo:genny:plugin", "../plugin/templates")) - ctx := plush.NewContext() - ctx.Set("opts", opts) - g.Transformer(plushgen.Transformer(ctx)) - g.Transformer(genny.Replace("-short-", opts.ShortName)) - g.Transformer(genny.Dot()) - gg.Add(g) - - lopts := &licenser.Options{ - Author: opts.Author, - Name: opts.License, - } - - g, err := licenser.New(lopts) - if err != nil { - return gg, err - } - gg.Add(g) - - ig, err := initgen.New(&initgen.Options{ - Version: "v0.0.1", - VersionFile: filepath.Join(opts.ShortName, "version.go"), - Options: &makefile.Options{ - MainFile: "main.go", - Root: opts.Root, - }, - }) - if err != nil { - return gg, err - } - gg.Merge(ig) - - return gg, nil -} diff --git a/genny/plugins/plugin/plugin_test.go b/genny/plugins/plugin/plugin_test.go deleted file mode 100644 index 3cf854af9..000000000 --- a/genny/plugins/plugin/plugin_test.go +++ /dev/null @@ -1,69 +0,0 @@ -package plugin - -import ( - "testing" - - "github.com/gobuffalo/genny/gentest" - "github.com/gobuffalo/genny/gogen/gomods" - "github.com/stretchr/testify/require" -) - -func Test_Generator(t *testing.T) { - r := require.New(t) - opts := &Options{ - PluginPkg: "github.com/foo/buffalo-bar", - Year: 1999, - Author: "Homer Simpson", - ShortName: "bar", - } - - run := gentest.NewRunner() - - gg, err := New(opts) - r.NoError(err) - run.WithGroup(gg) - - r.NoError(run.Run()) - res := run.Results() - - var cmds []string - if !gomods.On() { - cmds = []string{"git init", "go get github.com/alecthomas/gometalinter", "gometalinter --install"} - } else { - cmds = []string{"git init", "go mod init github.com/foo/buffalo-bar", "go get github.com/alecthomas/gometalinter", "gometalinter --install", "go mod tidy"} - } - - gentest.CompareCommands(cmds, res.Commands) - - files := []string{ - ".gitignore", - ".goreleaser.yml.plush", - "azure-pipelines.yml", - "azure-tests.yml", - "LICENSE", - "Makefile", - "README.md", - "bar/listen.go", - "bar/version.go", - "cmd/available.go", - "cmd/bar.go", - "cmd/root.go", - "cmd/version.go", - "main.go", - } - r.NoError(gentest.CompareFiles(files, res.Files)) - - f, err := res.Find("README.md") - r.NoError(err) - r.Contains(f.String(), opts.PluginPkg) - - f, err = res.Find("cmd/version.go") - r.NoError(err) - r.Contains(f.String(), opts.PluginPkg+"/"+opts.ShortName) - r.Contains(f.String(), opts.ShortName+".Version") - - f, err = res.Find("main.go") - r.NoError(err) - r.Contains(f.String(), "github.com/foo/buffalo-bar/cmd") - -} diff --git a/genny/plugins/plugin/templates/-short-/listen.go.plush b/genny/plugins/plugin/templates/-short-/listen.go.plush deleted file mode 100644 index 95f8348b1..000000000 --- a/genny/plugins/plugin/templates/-short-/listen.go.plush +++ /dev/null @@ -1,8 +0,0 @@ -package <%= opts.ShortName %> - -import "github.com/gobuffalo/events" - -func Listen(e events.Event) error { - // do work - return nil -} diff --git a/genny/plugins/plugin/templates/-short-/version.go.plush b/genny/plugins/plugin/templates/-short-/version.go.plush deleted file mode 100644 index 16cfdcf33..000000000 --- a/genny/plugins/plugin/templates/-short-/version.go.plush +++ /dev/null @@ -1,3 +0,0 @@ -package <%= opts.ShortName %> - -const Version = "v0.0.0" diff --git a/genny/plugins/plugin/templates/README.md.plush b/genny/plugins/plugin/templates/README.md.plush deleted file mode 100644 index 0314d6544..000000000 --- a/genny/plugins/plugin/templates/README.md.plush +++ /dev/null @@ -1,22 +0,0 @@ -

- -

-GoDoc -Go Report Card -

- -# <%= opts.PluginPkg %> - -TODO: Description - -## Installation - -```bash -$ go get -u -v <%= opts.PluginPkg %> -``` - -## Usage - -```bash -$ buffalo <%= opts.ShortName %> --help -``` diff --git a/genny/plugins/plugin/templates/cmd/-short-.go.plush b/genny/plugins/plugin/templates/cmd/-short-.go.plush deleted file mode 100644 index 5dc38dad6..000000000 --- a/genny/plugins/plugin/templates/cmd/-short-.go.plush +++ /dev/null @@ -1,18 +0,0 @@ -package cmd - -import ( - "github.com/spf13/cobra" -) - -// <%= opts.ShortName %>Cmd represents the buffalo-<%= opts.ShortName %> command -var <%= opts.ShortName %>Cmd = &cobra.Command{ - Use: "buffalo-<%= opts.ShortName %>", - Short: "tools for working with <%= opts.ShortName %>", - RunE: func(cmd *cobra.Command, args []string) error { - return nil - }, -} - -func init() { - rootCmd.AddCommand(<%= opts.ShortName %>Cmd) -} diff --git a/genny/plugins/plugin/templates/cmd/available.go.plush b/genny/plugins/plugin/templates/cmd/available.go.plush deleted file mode 100644 index 0e658543a..000000000 --- a/genny/plugins/plugin/templates/cmd/available.go.plush +++ /dev/null @@ -1,14 +0,0 @@ -package cmd - -import ( - "github.com/gobuffalo/buffalo/plugins/plugcmds" - "<%= opts.PluginPkg %>" -) - -var Available = plugcmds.NewAvailable() - -func init() { - Available.Add("root", <%= opts.ShortName %>Cmd) - Available.Listen(<%= opts.ShortName %>.Listen) - Available.Mount(rootCmd) -} diff --git a/genny/plugins/plugin/templates/cmd/root.go.plush b/genny/plugins/plugin/templates/cmd/root.go.plush deleted file mode 100644 index 21b9130ae..000000000 --- a/genny/plugins/plugin/templates/cmd/root.go.plush +++ /dev/null @@ -1,22 +0,0 @@ -package cmd - -import ( - "fmt" - "os" - - "github.com/spf13/cobra" -) - -// rootCmd represents the base command when called without any subcommands -var rootCmd = &cobra.Command{ - Use: "buffalo-<%= opts.ShortName %>", -} - -// Execute adds all child commands to the root command and sets flags appropriately. -// This is called by main.main(). It only needs to happen once to the rootCmd. -func Execute() { - if err := rootCmd.Execute(); err != nil { - fmt.Println(err) - os.Exit(1) - } -} diff --git a/genny/plugins/plugin/templates/cmd/version.go.plush b/genny/plugins/plugin/templates/cmd/version.go.plush deleted file mode 100644 index 42aef81d1..000000000 --- a/genny/plugins/plugin/templates/cmd/version.go.plush +++ /dev/null @@ -1,23 +0,0 @@ -package cmd - -import ( - "fmt" - - "<%= opts.PluginPkg %>/<%= opts.ShortName %>" - "github.com/gobuffalo/buffalo/plugins" - "github.com/spf13/cobra" -) - -// versionCmd represents the version command -var versionCmd = &cobra.Command{ - Use: "version", - Short: "current version of <%= opts.ShortName %>", - RunE: func(cmd *cobra.Command, args []string) error { - fmt.Println("<%= opts.ShortName %>", <%= opts.ShortName %>.Version) - return nil - }, -} - -func init() { - <%= opts.ShortName %>Cmd.AddCommand(versionCmd) -} diff --git a/genny/plugins/plugin/templates/main.go.plush b/genny/plugins/plugin/templates/main.go.plush deleted file mode 100644 index e19be458e..000000000 --- a/genny/plugins/plugin/templates/main.go.plush +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "<%= opts.PluginPkg %>/cmd" - -func main() { - cmd.Execute() -} diff --git a/genny/plugins/plugin/with/generate.go b/genny/plugins/plugin/with/generate.go deleted file mode 100644 index efe1706ee..000000000 --- a/genny/plugins/plugin/with/generate.go +++ /dev/null @@ -1,57 +0,0 @@ -package with - -import ( - "fmt" - "strings" - - "github.com/gobuffalo/buffalo/genny/plugins/plugin" - "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/genny/new" - "github.com/gobuffalo/genny/plushgen" - "github.com/gobuffalo/packr/v2" - "github.com/gobuffalo/plush" -) - -// GenerateCmd generates a plugin project with go mods -func GenerateCmd(opts *plugin.Options) (*genny.Group, error) { - gg := &genny.Group{} - if err := opts.Validate(); err != nil { - return gg, err - } - - g := genny.New() - box := packr.New("./generate/templates", "./generate/templates") - if err := g.Box(box); err != nil { - return gg, err - } - ctx := plush.NewContext() - ctx.Set("opts", opts) - g.Transformer(plushgen.Transformer(ctx)) - - g.Transformer(genny.Replace("-shortName-", opts.ShortName)) - g.Transformer(genny.Dot()) - - g.RunFn(func(r *genny.Runner) error { - f, err := r.FindFile("cmd/available.go") - if err != nil { - return err - } - const g = `Available.Add("generate", generateCmd)` - const m = `Available.Mount(rootCmd)` - body := strings.Replace(f.String(), m, fmt.Sprintf("\t%s\n%s", g, m), 1) - return r.File(genny.NewFile(f.Name(), strings.NewReader(body))) - }) - - gg.Add(g) - - g, err := new.New(&new.Options{ - Name: opts.ShortName, - Prefix: "genny", - }) - if err != nil { - return gg, err - } - gg.Add(g) - - return gg, nil -} diff --git a/genny/plugins/plugin/with/generate/templates/cmd/generate.go.plush b/genny/plugins/plugin/with/generate/templates/cmd/generate.go.plush deleted file mode 100644 index c137071c4..000000000 --- a/genny/plugins/plugin/with/generate/templates/cmd/generate.go.plush +++ /dev/null @@ -1,49 +0,0 @@ -package cmd - -import ( - "context" - - "<%= opts.PluginPkg %>/genny/<%= opts.ShortName %>" - "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/gogen" - "github.com/spf13/cobra" -) - -var generateOptions = struct { - *<%= opts.ShortName %>.Options - dryRun bool -}{ - Options: &<%= opts.ShortName %>.Options{}, -} - -// generateCmd represents the generate command -var generateCmd = &cobra.Command{ - Use: "<%= opts.ShortName %>", - Short: "generates a new <%= opts.ShortName %>", - RunE: func(cmd *cobra.Command, args []string) error { - r := genny.WetRunner(context.Background()) - - if generateOptions.dryRun { - r = genny.DryRunner(context.Background()) - } - - g, err := <%= opts.ShortName %>.New(generateOptions.Options) - if err != nil { - return err - } - r.With(g) - - g, err = gogen.Fmt(r.Root) - if err != nil { - return err - } - r.With(g) - - return r.Run() - }, -} - -func init() { - generateCmd.Flags().BoolVarP(&generateOptions.dryRun, "dry-run", "d", false, "run the generator without creating files or running commands") - <%= opts.ShortName %>Cmd.AddCommand(generateCmd) -} diff --git a/genny/plugins/plugin/with/generate_test.go b/genny/plugins/plugin/with/generate_test.go deleted file mode 100644 index 8c0edd132..000000000 --- a/genny/plugins/plugin/with/generate_test.go +++ /dev/null @@ -1,89 +0,0 @@ -package with - -import ( - "strings" - "testing" - - "github.com/gobuffalo/buffalo/genny/plugins/plugin" - "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/gentest" - "github.com/gobuffalo/genny/gogen/gomods" - "github.com/gobuffalo/packr/v2" - "github.com/stretchr/testify/require" -) - -var gBox = packr.New("generate_test", "../../plugin/templates") - -func Test_GenerateCmd(t *testing.T) { - r := require.New(t) - - err := gomods.Disable(func() error { - opts := &plugin.Options{ - PluginPkg: "github.com/foo/buffalo-bar", - Year: 1999, - Author: "Homer Simpson", - ShortName: "bar", - } - - run := gentest.NewRunner() - run.Disk.Add(genny.NewFile("cmd/available.go", strings.NewReader(availgo))) - - gg, err := GenerateCmd(opts) - r.NoError(err) - run.WithGroup(gg) - - r.NoError(run.Run()) - - res := run.Results() - r.Len(res.Commands, 0) - r.Len(res.Files, 7) - - f := res.Files[0] - r.Equal("cmd/available.go", f.Name()) - r.Contains(f.String(), `Available.Add("generate", generateCmd)`) - - f = res.Files[1] - r.Equal("cmd/generate.go", f.Name()) - r.Contains(f.String(), opts.PluginPkg+"/genny/") - - f = res.Files[2] - r.Equal("genny/bar/bar.go", f.Name()) - r.Contains(f.String(), "package bar") - r.Contains(f.String(), "func New(opts *Options) (*genny.Generator, error)") - - f = res.Files[3] - r.Equal("genny/bar/bar_test.go", f.Name()) - - f = res.Files[4] - r.Equal("genny/bar/options.go", f.Name()) - r.Contains(f.String(), "package bar") - r.Contains(f.String(), "type Options struct {") - - f = res.Files[5] - r.Equal("genny/bar/options_test.go", f.Name()) - - f = res.Files[6] - r.Equal("genny/bar/templates/example.txt", f.Name()) - return nil - }) - r.NoError(err) -} - -const availgo = `package cmd - -import ( - "github.com/gobuffalo/buffalo/plugins/plugcmds" - "github.com/spf13/cobra" -) - -var Available = plugcmds.NewAvailable() - -var pluginsCmd = &cobra.Command{ - Use: "plugins", - Short: "tools for working with buffalo plugins", -} - -func init() { - Available.Add("root", pluginsCmd) - Available.Mount(rootCmd) -}` diff --git a/genny/plugins/plugin/with/with-packr.go b/genny/plugins/plugin/with/with-packr.go deleted file mode 100644 index e7e14c925..000000000 --- a/genny/plugins/plugin/with/with-packr.go +++ /dev/null @@ -1,8 +0,0 @@ -// +build !skippackr -// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT. - -// You can use the "packr clean" command to clean up this, -// and any other packr generated files. -package with - -import _ "github.com/gobuffalo/buffalo/packrd" diff --git a/go.mod b/go.mod index 516d55c22..f25be17db 100644 --- a/go.mod +++ b/go.mod @@ -5,44 +5,43 @@ go 1.13 require ( github.com/BurntSushi/toml v0.3.1 github.com/dustin/go-humanize v1.0.0 - github.com/fatih/color v1.7.0 + github.com/fatih/color v1.9.0 github.com/gobuffalo/attrs v0.1.0 github.com/gobuffalo/buffalo-pop v1.23.1 - github.com/gobuffalo/clara v0.9.1 + github.com/gobuffalo/clara v0.10.1 github.com/gobuffalo/envy v1.8.1 github.com/gobuffalo/events v1.4.0 - github.com/gobuffalo/flect v0.1.7 - github.com/gobuffalo/genny v0.4.1 + github.com/gobuffalo/flect v0.2.0 + github.com/gobuffalo/genny v0.6.0 github.com/gobuffalo/github_flavored_markdown v1.1.0 - github.com/gobuffalo/helpers v0.4.0 + github.com/gobuffalo/helpers v0.6.0 github.com/gobuffalo/httptest v1.4.0 - github.com/gobuffalo/licenser v1.4.0 github.com/gobuffalo/logger v1.0.3 github.com/gobuffalo/meta v0.2.1 github.com/gobuffalo/nulls v0.1.0 github.com/gobuffalo/packd v0.3.0 github.com/gobuffalo/packr/v2 v2.7.1 github.com/gobuffalo/plush v3.8.3+incompatible - github.com/gobuffalo/pop v4.12.2+incompatible - github.com/gobuffalo/release v1.15.0 + github.com/gobuffalo/pop v4.13.1+incompatible github.com/gobuffalo/tags v2.1.7+incompatible - github.com/google/go-cmp v0.3.1 + github.com/gobuffalo/tags/v3 v3.0.2 + github.com/google/go-cmp v0.4.0 github.com/gorilla/mux v1.7.3 github.com/gorilla/sessions v1.2.0 - github.com/karrick/godirwalk v1.13.0 + github.com/karrick/godirwalk v1.14.1 github.com/markbates/grift v1.5.0 github.com/markbates/oncer v1.0.0 - github.com/markbates/refresh v1.8.0 + github.com/markbates/refresh v1.10.0 github.com/markbates/safe v1.0.1 github.com/markbates/sigtx v1.0.0 - github.com/monoculum/formam v0.0.0-20190830100315-7ff9597b1407 + github.com/monoculum/formam v0.0.0-20191229172733-952f0766a724 github.com/sirupsen/logrus v1.4.2 github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.5.0 + github.com/spf13/viper v1.6.2 github.com/stretchr/testify v1.4.0 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e - golang.org/x/tools v0.0.0-20191127171310-c1736c0f0a5b + golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc gopkg.in/yaml.v2 v2.2.7 ) diff --git a/go.sum b/go.sum index 4f5575dd3..106cff7eb 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,9 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dustin/go-humanize v0.0.0-20180713052910-9f541cc9db5d/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= @@ -139,8 +140,9 @@ github.com/gobuffalo/buffalo-pop v1.23.1/go.mod h1:Sb+fy/hLtxfhOrtLAJiL7JsKqazyd github.com/gobuffalo/clara v0.4.1/go.mod h1:3QgAPqYgPqAzhfGbNLlp4UztaZRi2SOg+ZrZwaq9L94= github.com/gobuffalo/clara v0.6.0/go.mod h1:RKZxkcH80pLykRi2hLkoxGMxA8T06Dc9fN/pFvutMFY= github.com/gobuffalo/clara v0.7.0/go.mod h1:pen7ZMmnuYUYVF/3BbnvidYVAbMEfkyO4O+Tc+FKICU= -github.com/gobuffalo/clara v0.9.1 h1:LYjwmKG0VwwW/nOG2f5jNamvAcfdm2Ysokc/eoVhtZ8= github.com/gobuffalo/clara v0.9.1/go.mod h1:OQ3HmSqLQJHaMmKhuTkmBCvBLL4BhgjweNpywRGulWo= +github.com/gobuffalo/clara v0.10.1 h1:tY6AR1eFEXQwj2fUZVkjPaA47x8Rw5w5UiDaHnExlPM= +github.com/gobuffalo/clara v0.10.1/go.mod h1:XcB5V5Vx5wuq/cXZOV0kAPetk7CYxSLFG5YvpyTxzxI= github.com/gobuffalo/depgen v0.0.0-20190219190223-ba8c93fa0c2c/go.mod h1:CE/HUV4vDCXtJayRf6WoMWgezb1yH4QHg8GNK8FL0JI= github.com/gobuffalo/depgen v0.0.0-20190315122043-8442b3fa16db/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= github.com/gobuffalo/depgen v0.0.0-20190315124901-e02f65b90669/go.mod h1:yTQe8xo5pGIDOApkeO95DjePS4ZOSSSx+ItkqJHxUG4= @@ -211,8 +213,8 @@ github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= github.com/gobuffalo/flect v0.1.6/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= -github.com/gobuffalo/flect v0.1.7 h1:qQqM2eGdM6tJX8yHKYBM0wVHBLjUT7Qs6uk5jnAhOwI= -github.com/gobuffalo/flect v0.1.7/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= +github.com/gobuffalo/flect v0.2.0 h1:EWCvMGGxOjsgwlWaP+f4+Hh6yrrte7JeFL2S6b+0hdM= +github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= github.com/gobuffalo/genny v0.0.0-20180924032338-7af3a40f2252/go.mod h1:tUTQOogrr7tAQnhajMSH6rv1BVev34H2sa1xNHMy94g= github.com/gobuffalo/genny v0.0.0-20181003150629-3786a0744c5d/go.mod h1:WAd8HmjMVrnkAZbmfgH5dLBUchsZfqzp/WS5sQz+uTM= github.com/gobuffalo/genny v0.0.0-20181005145118-318a41a134cc/go.mod h1:WAd8HmjMVrnkAZbmfgH5dLBUchsZfqzp/WS5sQz+uTM= @@ -254,8 +256,9 @@ github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ github.com/gobuffalo/genny v0.2.0/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= github.com/gobuffalo/genny v0.3.0/go.mod h1:ywJ2CoXrTZj7rbS8HTbzv7uybnLKlsNSBhEQ+yFI3E8= github.com/gobuffalo/genny v0.4.0/go.mod h1:Kdo8wsw5zmooVvEfMkfv4JI9Ogz/PMvBNvl133soylI= -github.com/gobuffalo/genny v0.4.1 h1:ylgRyFoVGtfq92Ziq0kyi0Sdwh//pqWEwg+vD3eK1ZA= github.com/gobuffalo/genny v0.4.1/go.mod h1:dpded+KBgICFciAb+6R5Lo+1VxzofjqHgKqFYIL8M7U= +github.com/gobuffalo/genny v0.6.0 h1:d7c6d66ZrTHHty01hDX1/TcTWvAJQxRZl885KWX5kHY= +github.com/gobuffalo/genny v0.6.0/go.mod h1:Vigx9VDiNscYpa/LwrURqGXLSIbzTfapt9+K6gF1kTA= github.com/gobuffalo/gitgen v0.0.0-20190219185555-91c2c5f0aad5/go.mod h1:ZzGIrxBvCJEluaU4i3CN0GFlu1Qmb3yK8ziV02evJ1E= github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= github.com/gobuffalo/github_flavored_markdown v1.0.4/go.mod h1:uRowCdK+q8d/RF0Kt3/DSalaIXbb0De/dmTqMQdkQ4I= @@ -274,11 +277,15 @@ github.com/gobuffalo/helpers v0.0.0-20190506214229-8e6f634af7c3/go.mod h1:HlNpmw github.com/gobuffalo/helpers v0.2.1/go.mod h1:5UhA1EfGvyPZfzo9PqhKkSgmLolaTpnWYDbqCJcmiAE= github.com/gobuffalo/helpers v0.2.2/go.mod h1:xYbzUdCUpVzLwLnqV8HIjT6hmG0Cs7YIBCJkNM597jw= github.com/gobuffalo/helpers v0.2.4/go.mod h1:NX7v27yxPDOPTgUFYmJ5ow37EbxdoLraucOGvMNawyk= -github.com/gobuffalo/helpers v0.4.0 h1:DR/iYihrVCXv1cYeIGSK3EZz2CljO+DqDLQPWZAod9c= github.com/gobuffalo/helpers v0.4.0/go.mod h1:2q/ZnVxCehM4/y1bNz3+wXsvWvWUY+iTUr7mPC6QqGQ= +github.com/gobuffalo/helpers v0.5.0/go.mod h1:stpgxJ2C7T99NLyAxGUnYMM2zAtBk5NKQR0SIbd05j4= +github.com/gobuffalo/helpers v0.6.0 h1:CL1xOSGeKCaKD1IUpo4RfrkDU83kmkMG4H3dXAS7dw0= +github.com/gobuffalo/helpers v0.6.0/go.mod h1:pncVrer7x/KRvnL5aJABLAuT/RhKRR9klL6dkUOhyv8= github.com/gobuffalo/here v0.2.3/go.mod h1:2a6G14FaAKOGJMK/5UNa4Og/+iyFS5cq3MnlvFR7YDk= -github.com/gobuffalo/here v0.4.0 h1:TD+FD+jQkp5iNPYEAxT6E+4O8u/pOQJyDjmZNC0+/80= github.com/gobuffalo/here v0.4.0/go.mod h1:bTNk/uKZgycuB358iR0D32dI9kHBClBGpXjW2HVHkNo= +github.com/gobuffalo/here v0.5.1/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= +github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI= +github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= github.com/gobuffalo/httptest v1.0.2/go.mod h1:7T1IbSrg60ankme0aDLVnEY0h056g9M1/ZvpVThtB7E= github.com/gobuffalo/httptest v1.0.3/go.mod h1:7T1IbSrg60ankme0aDLVnEY0h056g9M1/ZvpVThtB7E= github.com/gobuffalo/httptest v1.0.4/go.mod h1:7T1IbSrg60ankme0aDLVnEY0h056g9M1/ZvpVThtB7E= @@ -462,8 +469,9 @@ github.com/gobuffalo/pop v4.11.2+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcV github.com/gobuffalo/pop v4.11.3+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= github.com/gobuffalo/pop v4.12.0+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= github.com/gobuffalo/pop v4.12.1+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= -github.com/gobuffalo/pop v4.12.2+incompatible h1:WFHMzzHbVLulZnEium1VlYRnWkzHz39FzVLov6rZdDI= github.com/gobuffalo/pop v4.12.2+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= +github.com/gobuffalo/pop v4.13.1+incompatible h1:AhbqPxNOBN/DBb2DBaiBqzOXIBQXxEYzngHHJ+ytP4g= +github.com/gobuffalo/pop v4.13.1+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= github.com/gobuffalo/release v1.0.35/go.mod h1:VtHFAKs61vO3wboCec5xr9JPTjYyWYcvaM3lclkc4x4= github.com/gobuffalo/release v1.0.38/go.mod h1:VtHFAKs61vO3wboCec5xr9JPTjYyWYcvaM3lclkc4x4= github.com/gobuffalo/release v1.0.42/go.mod h1:RPs7EtafH4oylgetOJpGP0yCZZUiO4vqHfTHJjSdpug= @@ -484,8 +492,6 @@ github.com/gobuffalo/release v1.4.0/go.mod h1:f4uUPnD9dxrWxVy9yy0k/mvDf3EzhFtf7/ github.com/gobuffalo/release v1.7.0/go.mod h1:xH2NjAueVSY89XgC4qx24ojEQ4zQ9XCGVs5eXwJTkEs= github.com/gobuffalo/release v1.8.3/go.mod h1:gCk/x5WD+aIGkPodO4CuLxdnhYn9Jgp7yFYxntK/8mk= github.com/gobuffalo/release v1.13.4/go.mod h1:5Cc4TSNxP4QFV2ZUYcgPiBBV7YyRomHecGTQuuy26G4= -github.com/gobuffalo/release v1.15.0 h1:bE97SdPFoRDz5BKC+QmTNYJa+aHbBMqG/nUkHW6xSug= -github.com/gobuffalo/release v1.15.0/go.mod h1:LwotdbqCKcpQ+bKAvk1vvXLZhM8ftBTI5AlE7mx/1H8= github.com/gobuffalo/shoulders v1.0.1/go.mod h1:V33CcVmaQ4gRUmHKwq1fiTXuf8Gp/qjQBUL5tHPmvbA= github.com/gobuffalo/shoulders v1.0.3/go.mod h1:LqMcHhKRuBPMAYElqOe3POHiZ1x7Ry0BE8ZZ84Bx+k4= github.com/gobuffalo/shoulders v1.0.4/go.mod h1:LqMcHhKRuBPMAYElqOe3POHiZ1x7Ry0BE8ZZ84Bx+k4= @@ -503,12 +509,16 @@ github.com/gobuffalo/tags v2.1.0+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67 github.com/gobuffalo/tags v2.1.5+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY= github.com/gobuffalo/tags v2.1.7+incompatible h1:GUxxh34f9SI4U0Pj3ZqvopO9SlzuqSf+g4ZGSPSszt4= github.com/gobuffalo/tags v2.1.7+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY= +github.com/gobuffalo/tags/v3 v3.0.2 h1:gxE6c6fA5radwQeg59aPIeYgCG8YA8AZd3Oh6fh5UXA= +github.com/gobuffalo/tags/v3 v3.0.2/go.mod h1:ZQeN6TCTiwAFnS0dNcbDtSgZDwNKSpqajvVtt6mlYpA= github.com/gobuffalo/uuid v2.0.3+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE= github.com/gobuffalo/uuid v2.0.4+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE= github.com/gobuffalo/uuid v2.0.5+incompatible h1:c5uWRuEnYggYCrT9AJm0U2v1QTG7OVDAvxhj8tIV5Gc= github.com/gobuffalo/uuid v2.0.5+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE= github.com/gobuffalo/validate v2.0.3+incompatible h1:6f4JCEz11Zi6iIlexMv7Jz10RBPvgI795AOaubtCwTE= github.com/gobuffalo/validate v2.0.3+incompatible/go.mod h1:N+EtDe0J8252BgfzQUChBgfd6L93m9weay53EWFVsMM= +github.com/gobuffalo/validate/v3 v3.0.0 h1:dF7Bg8NMF9Zv8bZvUMXYJXxZdj+eSZ8z/lGM7/jVFUE= +github.com/gobuffalo/validate/v3 v3.0.0/go.mod h1:HFpjq+AIiA2RHoQnQVTFKF/ZpUPXwyw82LgyDPxQ9r0= github.com/gobuffalo/x v0.0.0-20181003152136-452098b06085/go.mod h1:WevpGD+5YOreDJznWevcn8NTmQEW5STSBgIkpkjzqXc= github.com/gobuffalo/x v0.0.0-20181007152206-913e47c59ca7/go.mod h1:9rDPXaB3kXdKWzMc4odGQQdG2e2DIEmANy5aSJ9yesY= github.com/gobuffalo/x v0.0.0-20181025165825-f204f550da9d/go.mod h1:Qh2Pb/Ak1Ko2mzHlGPigrnxkhO4WTTCI1jJM58sbgtE= @@ -534,14 +544,16 @@ github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -612,6 +624,8 @@ github.com/joho/godotenv v1.2.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqx github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= github.com/karrick/godirwalk v1.7.7/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= @@ -620,8 +634,8 @@ github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaR github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/karrick/godirwalk v1.12.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= -github.com/karrick/godirwalk v1.13.0 h1:GJq8GHQEAPsjwqfGhLNXBO5P0dS2HYdDRVWe+P4E/EQ= -github.com/karrick/godirwalk v1.13.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= +github.com/karrick/godirwalk v1.14.1 h1:eFeFrvfLc79AXZ5782mZsVx6T41uxVORlddagiORs4E= +github.com/karrick/godirwalk v1.14.1/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -675,8 +689,9 @@ github.com/markbates/refresh v1.4.11/go.mod h1:awpJuyo4zgexB/JaHfmBX0sRdvOjo2dXw github.com/markbates/refresh v1.5.0/go.mod h1:ZYMLkxV+x7wXQ2Xd7bXAPyF0EXiEWAMfiy/4URYb1+M= github.com/markbates/refresh v1.6.0/go.mod h1:p8jWGABFUaFf/cSw0pxbo0MQVujiz5NTQ0bmCHLC4ac= github.com/markbates/refresh v1.7.1/go.mod h1:hcGVJc3m5EeskliwSVJxcTHzUtMz2h8gBtCS0V94CgE= -github.com/markbates/refresh v1.8.0 h1:ELMS9kKyO/H6cJrqFo6qCyE0cRx2JeHWC9yusDkVeM8= github.com/markbates/refresh v1.8.0/go.mod h1:ppl0l94oz3OKBAx3MV65vCDWPo51JQnypdtFUmps1NM= +github.com/markbates/refresh v1.10.0 h1:xn+ZSDPED3SvQJDnHkX3vLhFkEVKGWBKWkPKiLYGC4Q= +github.com/markbates/refresh v1.10.0/go.mod h1:txAFIPNbphfNCZELWAQ440wIKnmZKRX64TBdKiAMWfg= github.com/markbates/safe v1.0.0/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= @@ -686,14 +701,17 @@ github.com/markbates/willie v1.0.9/go.mod h1:fsrFVWl91+gXpx/6dv715j7i11fYPfZ9ZGf github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -710,8 +728,9 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba/go.mod h1:RKgILGEJq24YyJ2ban8EO0RUVSJlF1pGsEvoLEACr/Q= github.com/monoculum/formam v0.0.0-20190307031628-bc555adff0cd/go.mod h1:JKa2av1XVkGjhxdLS59nDoXa2JpmIHpnURWNbzCtXtc= github.com/monoculum/formam v0.0.0-20190730134247-0612307a4099/go.mod h1:JKa2av1XVkGjhxdLS59nDoXa2JpmIHpnURWNbzCtXtc= -github.com/monoculum/formam v0.0.0-20190830100315-7ff9597b1407 h1:ZU5O9BawmEx9Mu1lxn9NLIwO9DrqRfjE+HWKU+e9GKQ= github.com/monoculum/formam v0.0.0-20190830100315-7ff9597b1407/go.mod h1:JKa2av1XVkGjhxdLS59nDoXa2JpmIHpnURWNbzCtXtc= +github.com/monoculum/formam v0.0.0-20191229172733-952f0766a724 h1:qlTmDrFZLQIGXnd1JE58dqyLnKyIJjR9WBeDQcT3O8w= +github.com/monoculum/formam v0.0.0-20191229172733-952f0766a724/go.mod h1:JKa2av1XVkGjhxdLS59nDoXa2JpmIHpnURWNbzCtXtc= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= @@ -721,15 +740,17 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.9.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY= +github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.6.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -801,6 +822,10 @@ github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d h1:yKm7XZV6j9Ev6lojP2XaIshpT4ymkqhMeSghO5Ps00E= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= @@ -829,8 +854,8 @@ github.com/spf13/viper v1.3.0/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.5.0 h1:GpsTwfsQ27oS/Aha/6d1oD7tpKIqWnOA6tgOX9HHkt4= -github.com/spf13/viper v1.5.0/go.mod h1:AkYRkVJF8TkSG/xet6PzXX+l39KhhXa2pdqVSxnTcn4= +github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E= +github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -888,12 +913,14 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c h1:/nJuwDLoL/zrqY6gf57vxC+Pi+pZ8bfhpPkicO5H7W4= golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180816102801-aaf60122140d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -975,8 +1002,10 @@ golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= @@ -1032,6 +1061,7 @@ golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190315044204-8b67d361bba2/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190318200714-bb1270c20edf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190404132500-923d25813098/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190407030857-0fdf0c73855b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -1053,12 +1083,15 @@ golang.org/x/tools v0.0.0-20190906203814-12febf440ab1/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191015150414-f936694f27bf/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191127171310-c1736c0f0a5b h1:YOPm2ECOnQ8d6CJ6RbKWtMaO0cbC+S9l0x4MlK7IEwI= -golang.org/x/tools v0.0.0-20191127171310-c1736c0f0a5b/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191224055732-dd894d0a8a40/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9 h1:KOkk4e2xd5OeCDJGwacvr75ICCbCsShrHiqPEdsA9hg= +golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= @@ -1093,6 +1126,8 @@ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKW gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go index dab1d4040..cf18f2e54 100644 --- a/packrd/packed-packr.go +++ b/packrd/packed-packr.go @@ -16,7 +16,6 @@ var _ = func() error { hgr, err := resolver.NewHexGzip(map[string]string{ "02b77c3f78207a63659610bd95d29d17": "1f8b08000000000000ff748dc1ca84300c84ef3e45f028fcbf775f46aa8ed940aca54d171f7f69297b90f596998fcc07cfe291a68e6897eb403988e0dda2d826b298d111f1b91ff68454fc237be327c2b56ade300767afeafe238eb25b1a87611c6aeecb351b92fdf3d9b7ea9e6f859e9cda7bc88bcada82e108ea0c054667e2b94abff63656773e010000ffffe75677df11010000", "05100d4d041557fb02475d22742548e4": "1f8b08000000000000ffa4935b4cd3671887ff26de6d59d8922d9b2eb33aa6558aadd406e3d45a40c64108300373ba1a8452a0500e838156401ca70844c7383928c7164a2dd0ca414e15778893a51048c620dbc230195bb22cc8b8a63c0b2064f77b9237bf2f5fbee77baf7e82b04bd82578786ca44848dc2d086f0882201604c143100491b075bfc96e4178eda5add98617acadb937f3f9f3659a4d7da87515f845e57136328f8bdadb7cf9958da53ffedc79bbbebebeade2766f9dedfde3f886e4f2e6891cde3e654074c680e8d475f61ccfe6755926126526f75a1cb0beb6e96fccb65b5963c1439c88e7f9124ec616732cbe0ec9d53abce38d48a38bf009c9c033a89457c449a4196a5ffcb1b5bfbbcfc9ab122d074f5fc753994de0d57c62efd850dfed475d35486c652767626f7128bc0cb1d2c0cbe238caab4c9beef2df7fa1d21bf1d2b4228b337230b21275452fe9ed8f894a2f223aa7820cf3d7846519d92bcfe4685809b24bb5482e55323bf70b2d3d4ec4da0e14993dc8756df8e5b4139e5e8ad7c9300e78fb73c05b85541941f8a795f86aeea248ef24a0681c454e3f85f71cc4df6cc24b67c3476f45a16be1d4875af61c3cc33b9200ce4705e11f1acc5b87fcd92f0d40f5710e87833fc7d3ff069ee70af8405d4a68463d47d3ecc8d36c48350dec93a808bb10c4a0ed0263c3597cebd4d1d61081af4ac561df18fc937bf152d72055d713a83111906e449a6a439e66c53bae91d331494c4d14b3f49b93d68e62ec0faa595eeaa3c79ec989c81b84660fe095d080546f2144dfcdfb294dc852adc8f55d48932d4414753038d2c4946b9edfe7ef303f6361c6354daba39ae8422731d726507e3688a2e009970d03f8c455732cb50b9f940e8e6adbf0cbed22bfc5ccf0680521091a92f232187df405ba9a2e0c75e32494b8f8e4d614970b2729ab1b22bfda8a58d3caf1e4667c7466e4574a286fba4f424115fb4e46f3eed98b14d69ac82a6f446d3061ec71d1f77896fc2a3b13ae196e37f6225237234bb17248634671a58ce8f85444de4a8e28cef19e4cc511df603e4acce2669505ebc8240ee7534cf7fb8175565756d116d713985c4a446e2389e5163a1f0c11a54e65efe1b3ec97faa1bf5648f7c8180ee7389d030fa96e32b3b2f2cf4e7fa6e77e64e1d90293ae27d807da714d7fc7af8b0b34771ae91f3633fbf337fc30fd90c1d12e0686fa585d5dddf4fedba1ed362e3e5be4d1b883a1e1562626cc3cfddec4d8580b63ce1ee6e67ec2ed76efb81b08ff937f030000ffff6ddbe2317e040000", - "05e19295c88c44d295648bdae4acecc9": "1f8b08000000000000ff9491cd6aeb301085f77a8a41b959daba50e822d8eea281d24d13fab3f758562451d923a471fafa05a76d429b14ba12127ce77c9aa92260f076aca536239b249bca0f1672d2b574cc31af94b29eddd4959a0665a99b763b0ca4bece409d1a30b3492a90a532efad8437dfb3abe5d5f57fd9542a3642fc2c1215824b667752443de9929255d5b2068a9ccb6d98ac1fb7af1696cd59b7df919bccc8533e4861e05aded19ab404d5540acf2a241329b1c6d4cf3f3e5cff22f42da0c3de9a0bfca7123cce0cdc62ea8f6ef3dc16701615e279b3deac606db24e3eb2a75188c502eec7cc18021e1edab6ed303bf10f2c81350cc504c5fe4262dbb673c44b466b4ed98f551fb12747891f7030b06ca0289c0971a6df030000ffff6adc5c3b4d020000", "06011b1be9e2c4c5af5b87c37b111fb5": "1f8b08000000000000ffb4525fabd330147fcfa738373048e092828fd3de27ef54d0090e049f246dd31a97e68424ad1ba3df5d925654e6540ab72ffd93dff9fd3b75b23eca4e812444f70e7d044600a8c18ea67b885edb2ee4e74ec72f43256aec8b0eaba16da5c1a235aa8eb78f1dbabf1ccafae88bf15942bcd894a05b60e862108f76d41e6daf6c84bb1268a34665d0a577cae1029b879b9cca8ee7990fa684e384b483ad415b1d1987cb2a29dd82f21eb625247af16e08f1a022a3afde7f7edc7fa4f74013e715dfe681f2e779f2ae04ab4d564f97c14eec64948629ef3901987e714c001a8feea58cb292417dea0de3e96385a7e4209726f6ea1ba34be6addca674c98628289ffd567812af656054dbbc228d3688af012de58b8d70ff2354c2eeb46d0e79d97f1ac9034b0bffca32a701c8d4cbff93fc7e50b2519e851993984ac83ae22dcae6cd4f4de657e84d645a367d555e1e5dd95eb31089736ffea3b9dfe14fd59a43973bdb79ec5797f53d0000ffff2c57ff41f9030000", "0694c6ea5c1d85f554afb9a0057580a1": "1f8b08000000000000ff8c8d414a04410c45d7d629c2308b6e90f45e702588a0a2a81788d569a7a12a35a4532086dc5d70445dbafb3c1effb98392bc31ec29dbda042e2e014f738388344de0be47a1caf8485ba6b27e7084fbb7ff17c2cc0bf562b0d663e1ca62f4a5a4a54bfeffcd90e1b52f0b9586574d8cdf6d04566d0a9ece94adab40c62796997538981df1d9c8faf6707b0e8a372ff777c3ee2776bd168e987e43278007ab65378e29923bcb1c913e030000ffff1fc509720a010000", "0b4e548d0d999245c21d128e3591ddec": "1f8b08000000000000ff4c8e414ac6301085d7ce2986ac5a90e4106e0a2a827a81f9d369136c326132911fc4bb4ba10b578ff7787c7c8de217ed8c142d4bed00b93451c309105d650bc9ac3938db9e2d8d9b8f52c22eb7b16d7448b8d2c10c10022e5278a1ba1eac983b12aebcd1380cd3359a6067fd661cedfc1326298c8d76f6b08d1aff13a68817de3f4935bedb8cac2a8a3ff0a06c432b46ffce75659d4e4fff6164a3bf3d3fa2fae5f3f56572b9ae7cf7c9cae1e6197ee12f0000ffff1754f1f8f0000000", @@ -29,7 +28,7 @@ var _ = func() error { "249b50674fa80d5d2389e61231cdbc08": "1f8b08000000000000ff2cc74d0a84300c06d0f5e41421ab7163cf9496fea16d827ebdbf20ae1ecf351d5a336b42b77913f5e17681ffc4cc2c332334c0e52dfda476b415f76423548bab143d2d7c0a6df4040000ffff73c1922350000000", "2b101e95a5f58f9db6a47dae28e04166": "1f8b08000000000000ff7c52cd8a1b3d10bcfb29fa1318fc416686dc72900cf9bb267b302c3985b6a667d56b8d24a4f62c8ef1bb87b16cafc3929c24d155d5adaad6ff7df9fe79f3e3e12b3819fd7aa1eb01a01d613f5f00f44882107024a326a69714b328b031080531ea857b71a6a7892d35e7c73be0c0c2e89b62d19379afee85acc35c488cdacbd07cb89684c5d3fad37e18d04768e07884362629edc794da6f3852bb9911fc8be074d25d852f008ec706788010e50effc8e21e699bd0eee074aa0d96068a1c3c1547241b7c5aa96d6dd6da52d4ffb0bcaa51e8ff41c2943c5b148ee19ef8a74bb6e4a1499871bcf309f7e228085b96c34f893b0a0ababf702fe51b771ee42d1f96eb5709cf610799bc516c6350e0320d176229240f286ea578c4272add80d30c6ad9c6f307ce21e8ee1ab9dec6feb05e54dd9e27b01e4b316a1e073950be84560d4a98e7ac576af0585c3b2fd0ab2b157260f2fdcda8aee7e9aabe34f08c13169b39bd35f8f9e6afeeea4cbaab0bfa3b0000ffff85cad3beb8020000", "380ebe4d9806da77bde6826811c711a7": "1f8b08000000000000ff84524d6bdc3010bdeb573c9425b40549ec2d98f4104ad99e9a3d945e83ac9d95c56a2da18fa590e6bf17c96e9a26949e9e791f339e678f740c891eb2492e968101027e86c8506375fe90a16c503919b57947660ae08f8f32c492e55d8c72afcd495bda9fecd313c74f985a200ee08a431cb7effb3473781ef1af68f79d4f07972022621dbd334ae74c2577c906582a1015d695a98ed284b3b261acc7a3f641bdc2bf2205e202a9a4949da61f31a482fdddb72f1ff9a6c1b0d9dd3754a39b3963b9684b79e9a1502e8cc906e2a2531e70fdfccc808b4e4e8f7e7103bbfb87cf5fbf0fe0cdc319bbc22e783d5b5c286517669829384398c8474a4cd64cc2768770676d69c0f50bcaebbe1d58b5851e56fa7fe9adb87913ddca1bc65ababdee153e4d7ab68412c06f6f077c78b39b37ad664299080b855df87d0d035ec796a59d7d59536f74c07ace9fffac35bc7eb145fc150000ffff696b81d58a020000", - "39754c543c1763e08ceca1b55ee96d20": "1f8b08000000000000ffec56cb6edb3a105d4b5f31108c403274e9bd812c7283b4c8a2818124dd14454289639bae442a24e55625f8ef855e7eca69bd68b2e92ae4701e67ce1c655cd0f41b5d20584b64613499b577e77c9fe785540642dfdaff4051b1401871985e02c925c38cdc36ef1a9cf3bdc0da11772e687c51b0da581ff9bcf7fe4c33cea8e15274110b6e96654252994f163229e7739ac9c9baf5c2fe2095decb19f97d5a7c815197fa46a49271b120f74671b18060a5a5a0050f9cf34d5534cdb59e7734473253b240e51c68a3cad480dd6d90360d36545c19a31aac0000d68e68174e754a33fe139d6bad1fe54355d4b7e7aeee34b0b687d8053d0a864aa752e1062467013857289e5355590b986904e7a831aabe35fdc6dbb2db0cce05c092bac8e0dbf3e10cbac46f4b85b587d371ee24e4f3da698fcef72713e8c8e41a8434a0f0a5e40a19241514b2002a18e4b4820481618606993f2f450ae13e0bd74baa9a0e86a889ba1a6154935417b3674ad05b5305aba40bd7e4ff92670c95ef3dc125747ee413557a49b319ad32495978b14a62b8188219f99e42532a01ab84f4d0f6e6ec6dc236a8dad0a174313cd5633e0a71ae873448d61645db55784ecde8788e43dc935956aa5e5e7f3ee19332dfcbf7e5ebf0b8df4455bb48fee9eb2df4d56d1f84051a0daa14806b5415189e2354b28494661950080a59f4ab0ac70184bbf72bc1eee91a6338305e2ba4e6d8fc58d4870872344bc9480de361c975773f52d7b1acc86bba1a9ffa77d52308cd0f18d790aea51098d69b378270dc6f5872a394543a06acff465bd59dd8d7dd3836e19b32bee71d2d8de114dec576ab136b535a70d37c05101ac5f3a7feb7c8669144ceddea99428dc2d80f1c333685ed62d961830ceea4186acb1482c1d7c0c51d7414ac8617c52078b62ff5c3aeeff07bcb5bb8eb3da4b45614afeb2d181452f05e8a69cb9fad9bdf93b4cf4cfb5d9cc74c1bf36eccb4e5ff0a33bf020000ffffdbf0e977810b0000", + "39754c543c1763e08ceca1b55ee96d20": "1f8b08000000000000ffec564b6fdc36103e4bbf6220188664a8dc436f0672488db4c8a1c102497a290a67248eb574255221a96d5582ffbda01efbd4badd439d4b4fe26b66bef9e613872d96bf6345e01c53ad356c3dcebd8f63d1b44a5b4863e7be038db222b81170ff0658a338d5ecfdb06fc0fb384a9cbb11de27c359923c2c86a1789a4fff82b5e0688592934525eca62b58a99a55a58aeee9096bb5da8ea768b5fd7e1e2b6d8edc66f16a15e08e6e3f60436cad554bda7b10063a431c8a1e5ad58255d0600bbdeaf4a2055bd79dc65afc45ecb3e4a44da934790f1c2d1668082c16350537838b4a41a938b13933fa0a3793d377b2545cc88a7db45ac80a9267a324b622f13eb67d4b97001babbbd2823be418078e876abcb5560f74010038778393399a7280edfdb8fa93fad4b761f6658a7b9f3837439c8cf619ee400a9e80f7ad160deade39a0da10788fd6ea301bf8cef7610f394a801721c8e2de9753194c8e5f970ae74eabe3fd45c8d7a5330e7d1ca43891290c486541d3d74ee8bd04517268b0878280534d9678fcd4c912d263161e36a8870c96a8c9a6186916480ac1dc95128cb6a8e1b998cc0dfba11335271d478ff006a673ec67d46683f51afb5a214f6f9f8b1c6e97606671a4c9765ac273c1666847758e76663b54a3e992bb1c1e4399cf4cbc9f212d92b5473166955e13333bafe3cb17c478b9fccb0a5f94f991bf5f7f5b2ef7aba8ea10c9fffa7a0d7d4d0d90a0226b407712684bba072b1a0afd054aac6b40485ad5cedd92ee12480fe76f25ff885bcae164f14113daf3e5cf6d1864d090dd28ce028c4f1b61a6f999bace65c55ed2d5dda5eb6a4690da3fe12e407a505252199a7f06e9dddce4d93bad95363950f8667bd55d78324ce5d899efc2c45174d634965d44b7fb570573aec456d8e12f80d46ad13ccecfa15d23c9bc7f6fd69a0c49eb7e1454f37bd837960336d8624fca21acdc43b2b89bf87c824e920778590e52d4c7523fcdfa03fd31f2961e9e5e52da288a97f5962c0a29f9568a19c35fad9b7f26e99899f1bfb88e99d1e69b313386ff4f98f93b0000ffff9dfa38c7040c0000", "3dc49c126d9ae937cfa7f3b28cd6695d": "1f8b08000000000000ff548fcb6dc3301044ef530a01ef36910e5c80409313890ec555b8348d741f08f900bebdc300efcd64cbd6152168906aeb0ff8672d8390921915b7d214633f14cd3297ddf2a3d215e2d1fd9262daa8089723a68f2eabe178dc6a491add39ced9f464990a597b791fec0a619ba749deaecb755827821c2523d9648f2bff41721c11e2b3419235b7ca652b3eac7fbde803e4be3dff5aeedb530282f819b23320171f8a958d3d0ee6b3e9f737be030000ffffcfa015bc01010000", "4458f74dae2e5b725e2ccf002ce9ed98": "1f8b08000000000000ff7492c18edb201086cfcc534c39d99585db957ab19443ab6ebb87dd4d14a7eab1621deca0624018278da2bc7b35d8de5372b060f0c7fcffcce065f357760a7ba98d0a0380eebd0b113360dcb88e0330dee97818df44e3fab2736f63db4ae3ca650dcaee55e0f730658fe7bb3f493c94c787bbc0b2923b0e39c051061cfae8935f5127ed7418f0e3e4443cda4e5b05d08eb6416d75cc72bc00b0b2c4cd688cb61d36ceb6bac336b81ee341a1b247012cd55dad283a8b9f2a66bc7ed96dfe6cd6db1d2f907ffef4f085e7c00e6eb8853dadeb8419d748430cb1e3a0c20df657fdb82596102f87e1e4c2fe96f2d7bafebdde7e9f516054a80ae973011835a24807aba91fafea4417a7b66464a240aaaa403252e0a245b9749b6e7e58a1d5062fc098719df821a334990a2107760560947aeeebab3a65f376eda37676b80022e2d3eee5f9599edd182be4266dc421f68617c0d84ef5dec8a8866fee5f8569de291197de57f39babe20251a14294eff134f7bc987494f1442f7ee6f8722d805d73b8c2ff000000ffff685bab16cb020000", "462c7c76f198fdd0129ec42ee775d844": "1f8b08000000000000ffbc92414b03311085effb2b1e2b85f552a878743d78d793b7b2946967acc126914cc2e2bf9760060b2a56058f99f95ee6bd4cd66bdd49a0e4e2347581bc60447f8859111f303bde4bd6beeb80777099697b9069ea00c024c7e8477899e2dc0480e32ab85a8c28c5f11d79e1a1e9fb732caefbc6d9d5f78f4ee1b4b9c1d9ca806de4970a68f462dd5ab3fe2e0965e10d651b18e23c1c8f28cffc25f1d320c329de2ffecdfb37fb2a2ae917dbfa34e42da527dc5016b50eb1770123722a62a57d652f57edf8167973ea5ff8e373bc060000fffff48dcecee6020000", @@ -41,19 +40,17 @@ var _ = func() error { "58087a293b8355d4c89fcbff6f66a041": "1f8b08000000000000ffec595b53e3b8127ecfafe8f1c329fb548e72ce79648b8730c02cb5b30c05817d9c12763b51214b1e4986b029fff7ad9664923089033bf71d9e42e2be7ceacbd72d53f3fc864f1178ee845676301055ad8d8374300048caca25f4a9d08d66ced5fecb54b85973cd725d8da6faba294b2ef5287e6e17a875d05e2c98ae9d65e3ba66bfeb02a53dbb99b66d32c80683d108263361a11412415898a242c31d16707d0f07c110831307ba2cd158e070cdadc8c13ad3e4ae3108a5366485178550d32160219c5053e0aa800225862f50f329323829e15e37062a4241ee2a6d90b4735dd512e7a00d0980422cfc337033aec0cd30ba152456a1729c62b794759aac906f70dd71983fddb19652df1108c52bfa907a4a86ecd21616205477d83d52f251da830ba1a68de406d22e84fe013b33ba46d3b619c91e1ec0845f4bdc8333d9182e1f0bfb87e24f8ce2e7687563f20de2a7bc42d63d8ed267dccd9692a335d1cbf3b751ea4ae01d4cb0aa257748272ed0ac68b9f8c4aeeb1f538c829087370ae5b0054ef717458ef261baefa536fe87cd210aa91eb8fb1a775a0e35b51800c40a7e101ab41eda5b611d4cd159e0523e72f8c6e8a66e5b16cbb951bebb7c8df1baf625e261d6dccdc8d69ba3096c88e7803421bddd0536f360d2fc01ea6bad1cce5d06688c3640a7202fe8bcd7c303c8b5521840954657fee73c280d00dc7c08fa06f6f62167575c3698266e9e642cfd77ad6b321e75b3018028e195bef12e000cbac628282bc78ec87399264a83335c591ebde946150929b6c430eb61bbe2e635b718caa06d09c0bf7cca2cdb18df85b7e12b732a14959b41db4867199c71c32b0b09b57ae2fb3fa9d1bc0f5fe9a4464be20152135ab160e7104bde4807b774680bdc60b0b0ffbf4736f6ffffdf84743e104637671d8063a3abe03acd59fc23cb22ca737446e02d6e2f9865320e0f426cd11872f1818da54c7ba395fde2855fed8312723d1f684c17f0d108c645118bcf63a68ed1ab0500568370907305d7088d0d8c44025defd2c97376812e4d96214c86f0a18b833659c82e1d41216ca22076e10c51e07ad177bffea76d03da9950ceb7f5b8711a0caa020d7ac816b9c96750fbe67ec00652e71ecf1263f7e87d6db014f364b89c42cb5ef335b95800aa223a8fc1cbd9b9779ad20064178ebbc6befb6d088611a2341ff617719645beb898e9bbc01714ca823bee8fa5d536b6ea630f32d811c836f6182d16c92269dbb527be264f0edbe7900b21ff11c9856a5dfa7240e00ab0aaddfd96586fa3221aba12fba8a8b3f0c045130da55045df180a9933bc42870636e787d24dbdc7d678c0cdd9b150c56626e8c00e21724f9a6cb69d643d649187e8ae96fba976c714da2129ad70f7cfdbdd5da8437787482cf7dab1fd03afbd9fd1084ef12e1e2c747ea94de58f9c1be471215578b78d04964b71ef16b1950414de3dbdd34f7147a3ff2439dfd5ea3eed2ba62949af299d48570fba986ceb7c1d4972d76a48167d5ecfde5d7ce26e1880ed24f06f409507c493fdc662c066ae92a173305c93ec1a2de6ec60272b3e793ffa3e27d91597a2a0f42cb7870ed143700600b7688c1dae8c8b4e6fac8a5808fd515ac67547a444199cb15fb91dabfb348b927463e53701a72f300bfc960b492401425951e01275d7c85e333677504a86c1bc5f24e3fa4c4d0b7ccae33aaaf08ead59a10b7ac85d63d1d006dbe9e6da18ccc333a1eac6b1f591f731215caadae81cad25dc47ca0977ff9ca9b03623374d060feba4244406fd4d43e92e5e161d70b04d4efea1221053f4ec772cb99da5191b17459a448164081336a1e291becf57c870233ae6070f16acd3cf1e1165c046f71d83850871d36bfbcc928640a802e7fe8d4a3fc186e22b3ee7643d2a847b18ad3cbc707998aedb28f863e22553cf18a8fd5bf588503c9d9be9082fabf593e6c5cb12fc5d2fc18fb6a1cbda0fab7cc6d5147b16a248e5fd0bd1da6df7ecf2cbde7603f297a6fc819b72f36af97809ff6a3b65df4e16abed1fb393d1f87b59cafec652d6f842f8ca4bd9b3df74f877e4d6197d1ffe9fd647ed2befb2b792bb67f695a5ebf0e8edd1e4e88bf27bc4ff42f02f2f341f8d8d35545d997c06feff14be29895b3e3fdb14e1743bf9e6fcdb71cd5f010000ffff27116c459a200000", "593cbb702bb3c5a0fcbfa227df3a58f1": "1f8b08000000000000ff7452cb6edc300cbceb2b089dd6856b033d1ac821011a1468da5ef203b24ddb42255195a83c50ecbf17921f9b069bbdac389a1992637935fc5633821a58938b4268eb29309c04809c352fa96f06b2ed4c7d9a2665a8cd8ad03e7d911f32f6ff806ec4204525c4930a10e0d38a345fddac1d1650c5881cefe8056ea038373ff1f92495f7dd7a256b904dd3fad41b3dc84a8829b901b4d37caae0af000870039b6f966ec75fbeec9309f9d7b6f0edf1c70318f54a8981097a8414718489022863d6eb807f12468edd26cbe0439174a5ce73193da8ecdd7893e2d22c6c8dacc5a54fde6520c74a3bede6e24d13f082c068bd518c87fde30edcd14bf77efd83bd2570a9ab7ad3dfeee195e98e28df4e733b8e475f58d0780c11160c78acb862dd9ee156efc115939c9123f7b927e2c841f98cd8c32eb981ac45c7654ba31dc6b7ea1e0d3d8372236c6febfaabd9dcda6c1de5bbf63636f714ec777c5d3fc405aaaf33ef29ace4ffa09d7cce877325cee25f000000ffff1baf99a500030000", "5a8408312923fc8c5fdddc2e213566cc": "1f8b08000000000000ff010000ffff0000000000000000", - "5dd1df1b2c53e1a3425bfe5dc07ff730": "1f8b08000000000000ff8c525d6fdb38107ce7af58c4f778a26c1c0e07e4e0026ee4a645ebd870f3d13c1514b996b796962c49a10d0cfff782941ba76802147a90c4d9d919ceee08aeb714800228e8fa365211a26a102aab77e837d4222836e0f16b4f1e03bc9a1e2198fc27c7ff8a116c6374e1bc2c8dd5419a8c496dbb12b921c6b20fe89b9e0ca683823ad5609985b24e51f7d49a52bc592f17d0d8badf6c546bcbe3fb7cbf97d6c5206fd107b27c38800a9029e88558df5c41b733e4a170f0d7e57235bb7e5b06afcb9fb4997372a5f44e35b8da358783b85baedf57efd67f562cf67bdac009bca3b8bdc3da29bd83e27010238829ba6fd4b6a095de22c42d02bb0e8843546d0b21a2fb1b7a6e310470436ff9255806bd55dc6010b3aafa1590cfa9de2bcf5932953f28cfb2b57a07322790fe1f158b826de1bc6d3c8620f67b6c036666aa7c6aedb74236b9eef495c5e4f38616d6f42d865c37bfba85cbe56432592cab9b0ff3a9e5274d926c63a1c108b29472707c9cee304828d2c645d25058286be2523927868550ad23c6cc516e07ca98c1f79076adc2f6254cab42a38fb421ad2206f138f9ac20c4c572750f45b1f1b69b1ef7e9511ca41023b8616dbb0e3942b4e07bcec3ad89957f00623873de9a5e47b27c069d35782e463044f1797e753b3dc1a9d96b62931ba4f6d1c258e60782058aa015438d1010199223b07d0c64867dd296a322469f839e55d57a7a640b31ffb45a7e9cc33fe3f1f845cb1d355e251f016adc588f0961e2e6c98592f78b45754a6020e1ffa7812418bfa33e9dfc080000ffff8bb7f2403a040000", + "5dd1df1b2c53e1a3425bfe5dc07ff730": "1f8b08000000000000ff8c92df6fd33010c7dffd579c561e89d30a21a4a22295a50c045baab29f4fc871aeeed1e46c6c476caafabfa338651d8249a80f4dee7b779fcb7d6f04971b0a400114b45d13290b511984c2ea2dfa3535088a6bf0f8a3238f01decd0e124cdec8f16b31824d8c2e4cf3bcb63ac83a6952db364736c4987701bde9a8c63e9051ab0ce609943859d55153e7e2c3aa3c0763ab6ebd568dcd0fffd3dd4e5a1783bc461fc8f27e0f2a402a412fc4e2e21acecac964725e16575f1660f9105aaecadbbb34d834cf9db7f70fd2d846b191d61b21565717d06e6bf290397871562ee7971ff3e075fe1b37774e2e95de2a83cbadd9efc54db9fa5c7c5afd5fb2d8ed680d47f186e2e6062ba7f416b2fd5e8c20f62bff494d035ae90d42dc20b06b813844d5341022ba97d0718321801b7acbefc132e88d628341cc8be24f41fe8b7aa73c27649ffea03ccbc6ea2dc8b481fefd9198656c33e7adf11882d8edb009982afbcca7a3fd95c875ca3b3e25983c400e460e9e41d61f57240d9985bc22ce957362f05e358e18538d725b50753da08605552a6c9ed3b4ca34fa486bd22a62108f66258210a7e5f20eb26ced6d3b3b9cce231ca41023b8626ddb163942b4e03b4e7e54c4ca3f00319c386feb4e47b27c02adad712a46301cdab7c5c5f5ec28f7cdde13d7a941df3e5a18cbf48360812268c550210444867e22b05d0c540f27a02d47458c3e9df1bc2856b343b5108bdb65f97501afc6e3f1b323b764bceae70850e1da7aec1526364f3ea89ffdf4bc386e6028c2b747437a19ef511f23bf020000ffffd2b2c3b425040000", "6046dc01b561b25c62c4c0d22e8131a1": "1f8b08000000000000ffecbd6d8f1cc7912efa79f82beace7e590399c98cc8c837c3f48145c9f6023cf72cb05e5ddc4f06b74489bcdb228921454bfaf517f14454750f3994a8e1c86c9f630356176bbaba3223232322e3e589dffd8fefbf3d2c6f9e5cbd7af6e2f9834b4af97279f27c7df1d5b3e7df3cb8fceef5d7715cfe8fdfdffbddff15e3f2a727cf9f5c3d7efde2eab7cb1fbe7af15f4f967f3b1cbe7bf51ab716a694530ecb7f7cf9a7e58bef5fbeb87abdfcfbe1bb6fe2bf3d5f126e7e69eff8edd252cecb67df3d3b7cb5e4df2c4b8cfaf39fffaf877ff97ffffd8be5d59b6f967fffcfcf1efddbc3e532debfffff9487f7ef7ffe97cff10b94e8fefd2ffeefcbe5f2e9ebd72f7f7bfffedffef6b7f4b7925e5c7d73ff4f578f5f3e7db6bebaff1f5ffee9be7ef1f3bf7c7effd59b6f88d257afbfbafcfdbddfe92f9fcc932e97675f3db8fcecbbafbf7e7c78f1d7efeb1ffffaa7172f9f3eb9ba5cbefff6f0fcd5831b5ec23967fd51ffca6fbf3f3c7bfedf377d91e69cf7f1d7cbe5fb0797f9e5f797f72e961fec6a79f3ecc9df3e7ba1f797bccc8cff2bd51fffd7e149fcafc7eb7f7f73f5e2bbe75f3db87cfee46fcbb5ef7cffede1b7af5e3e5e9f3cb87c79f5e4d593ab374f746adffcfedec5ef5e3e7efd74f9fad9e1f0e0f2f98be74f2e9757afaf5efcf7930797ffc24493ea7623feedd957af9f3eb8a4b6df393c7bfe647dfcf2c125de7bedf6fff7e2d9f3b7ef7ffbecf593abc3b36f9fbd7e7049f972f9eac1e5bd8b8bff496d240934c6da66ec1ca8d53423514f25702fa9d8f5c3562971e839f53098024b4e822b9199c643bd6a75a612ec8b836710217c7bdebbb878c88553c1edc6a9e2bb6c97f88143cc89435e634e142951d04fd65bb1245e23a51eb9a7164b92586be25813c5c169e8233d12a516f5ff5cf020c522a9dfbbb8d03f732ca9c59c5aec8963d639e5d4d7ac132da904e23422e9a4f4e525d535871c721c3d75ff7895f52b55bfc291ea23e2ae447b3a93e8d06be49c585fa7cfd95b7aec69c6a62f0a19ffae4ae9d4624b823770121db37e869a26ee29f138b550f4bf071d3b4dffba4d44ffdcf5d3df1674c2ba2c2591fec9be1ab827b18fb6e2517c4fdfa66bcaab5243a92c51dfae33c0bcf19d8155183eda9186be8a31291dacbe4a473182a4b1e654424915eb37a20e9d729a4a76fb59c12b9b7ff2460c257adf2f9ee654fe0c56fcf1f2beee0be5e2c7577fba7afcd5b327cf5f63d3ffc7977ffab7cfff4a7fbd5cbef1dbfff9fcd9eb570f2ebf7bf5e4ea3f747ffdafe7fff9eac9e5f23d3db89429a9895c2e3fd083cb2a39b5dacae5f23d9ffe891f5cf69c6aa172f9fb7b1717bf7bf5fac5cb6579f1f5d7af9ebc7e709975ebfc7078f2e052efc7f5c5e1c5d56fffe573ea0f6bc320df7920491ef3e6a7f2c8f5b31b9fa21b1ff88cbf685ffcc16871ff3a31de121bdf5d1dfef55f36dafc06fb1a9bba041a1d9b9ad208d45a246a49b0a9c5ae8f9bbaee9bba1c37f59a95dd4bd48d2b2391f272e804ce3b44aa9466e8caff4df98138954734f426979cf8d13e085fd2972f0e3f7cf3e2b90ffb5ffef0c74ea55c2e2f5f3c7baeabd89ba8f490b934a92a1b724fb2d4ae7c53674fbcd43e12872a6369ac5ba99691ead2cad8af479e7e3db66ba154977b171723d7d443ad2df5a5cf9128d43ef57a8cd0724bbc74fd77689c535d7ae734432b92da72f141c36fa0928c5416154fa1144e75a9a2bb8570b7250a85ca5287ee84ac2f6fa2f7b24eaeebf04aae49963e702969e8c0bb4e8f5b4bb4d825eb4cbb8a4fa6aa93d63dc779a4b90c7d92b3a4b2cc1138531a0b652c49563a509e69069a4a5993607db125a3d1535d3863fff696445fcdd49575babe8565e8d77a496de1aa0ba1d7b4701bf8ced0eb5ef15365e101969839c9c243e9c1194f4e888bacb4e1a1220a9cb6f0245dac4636679e3d51682a6c17ee84eba9636e59af2be6c2e012a5e6a22a8a4313251265d1a5c3b313927576ac689aa1d6ae64645dfd5297a6e4aa042eaaa9059923b1bebf15d54bbd276535957375a6fa1e46e89f95cf59aef3f1084df0ab52f43aeb00949347a853c7c853c06a92faf5794063b6417abfe277664fdb1a756e200ef754436f9cfac24d257a1f25d5a55053119cf58152671a61704eb494a1ea58794254d486c13dcd45ca4ca4fa78912a50e57391a15c3fb8a5b12859200b74e349d1fb5413e900aa3263185997bc4edd897d369d2d29b9fbc0cc791b9872b9da05bd299bb7a65baf5749b4b4a933ec8595fd5507874e75e945d43e98398da5575299a02cb653ff28f9f63da8224fb7ce0cad97340fb1aa2ea4340e9cf186540fac6bdd0ea21f94cad3515239508dc574684b3dce5443e976a11a8f420e8d5458ea1cf7ab436f6a38ccc46f22cd43644923724be51065268e2dcd4727a3f9f1dd717ff6707ed11edab86b515ee342fa3ca9de95549e4612fd37d7d4637baab64c3bc4a202ad3d8d95f45f0c8191caaaef1e816a1a5174ab488b552da75e4c7147ddb80c5b43d7416a64e5a636cdae2a814ce3b34afb1194054a4f7c502b2a70a203bea41357f9cf9cc6a1c008a8a91d5ab7ab7aa8d574793d88287d929a7d072e6a9c49ea87d6d47ca1540f45ad0e4c905a2a5138f53791f8906145c83ad56aa846893860a2084cbca1d69e32995a7945a7d1a2c0b6503ad59ee6bbb46e7ff8bc7f518dd63c27e803aad14c2336d588983fc94c2d0c5d40bd948374d842f254482d3cb595cada7b12908af20ca3e0fb41bfaf8ba7dc3f92403b327e78ea42917d3fc953651f02c3347d693f28152434dc1cca067aafe8dcb2b2310fd8a5a93d526dc24166769e509bf0d1c9746e60b23fb6cff90f6c1317557041ca487d153556cd4a93585355ce51d394d68a498afe45774fd3bfa89d27abf285ee24e51ffd2495079c9ab21726a37f0b2a774999465f53549eeaafdb5c2516650f49758d2a9a945b6960044de75974282bb6206c509512532d793d87502a7a8428b34316ebe82567e85b7dddc9ec6ea203fee7741013ec92ca2a30be39546cd9118a32ad1e0b708ca87124561358cf033acab92a3b068e2aa71acce68989e9c8a4e43483f4aae3534b04d72d9cbcefe74646b01f549cafaa03d4245312e650c10d6dc5512cb1ae41d4f7e0c453d25c752f32560c6b596d852af6dfaae7a58089e8c6f6e38eb27fb53d8a93911e27aa4e7eac19363e36a8b1bc9ebc6ce84f0e87672f5f3d595e5f3d7efeeaeb1757df3eb8fcf6f1ebab67dfff6b4ec463519e9d3496fd436f4a4d35cb5846a9494aa1df5cbe3dfbf57b35c97b1a97cbfac383cb32492faf70f772b9fa019f3a00359d6f3586d839e5cc63e95992cc516e1e446992da368892f86e07d1d31cc5ecd95e3bbf6708256f74603ddbda105477db2070f50e1f756eb38e4dc489eed9ae7c14ab2d9f8a90ae4bdf54deb06e2e3000c5b9f1f84c12672c387f632bda2e54e1deedefd088d891ca416ab7eaaf06ce2627c63aa1246660bdad3bbf98ecb093abddcafb9951796be23e43a628b7d36aa2555f82932743ca90f3b1deebd10e93aad22ab481ee423bbceae932aac4aafa3b105838ef12045ec16070e0c4b91ffb60469c63ed67e034504182c3ea0ccdd527e11cdca31d73f5a45ed748f6749250ec341eaa523c43e2956813ab7a96d6a71ef26c81bb8a2c9e1557339c2cd5cfd8085c7194a1b1aa71112452379f05e368a7477c8874d61556f2135c225827b50fd49e523b081aa60635d887096fc29fa632432052598367d7ea16012437848b1a48b20e9fac1e9294bd42818722bbab420eee6c394415e9c36d9aa29c34d4a0e82a3eff8cf9fc7879efe2e2ed697f900f4ceed805564829d39aa89057abb729e734651de535d8905cb0a1365b6906eea60729f0486d9d60385ddad8942caad628a7baaa0a87e280882d38039aeebbc158b9b6e86aa106ae53175d42562d39c388259b229dbe27d80cb70e3d1e8a1de0121f8619a9f5d1fe433f7e900483cc8a26b4b6ffda3d1d38892c3da74679de2cc260cf7e9408738b9839d10adb0976287c62902aba99d706cf12991684b5c0f068a950e81015caef4aa8000b621abf43bb11dc52fa408f33a8d0834501c3bf2bf128520d3460a0817b0b2e093f0f438f60aa1fa03d39f5472763feb9556da14ad3d5c38c942174797bb65d4581724eb482f758d7146ec91a601f16350470b2527e13d8fdca753d1b29860b6963453267224cd4a47bb7d89e6e7086ce6096649295cdb690a087d6088710a920192b8c9f66f4afba8b0503512634f9a1d28fa71d305a6c50084a1c50c74e280433174ec30328cc6adbc23eee4a5736ff044ce50981aa4f408ce93d1c76533db841d60f3066ccce7e245542cb662aeb146c7554d1c841d9a2c6a9bf36201cf56755b4f32196a1a3c4407403412f1e224c42d8e513ebaa7bc797eb67247483d30167e615225a79ce5c9b6113d2b2ba8c0e9b8cd645d6adccab8be868225aa289e8eafa07323a988c8ebb8c8e2ea4e326a4a30969d5a32ea7e326a7e3514ec35bdd533b0c18bea4a7bad8931c7485479a8792f425ca4a8f4ea6f5cefc3f89a8aee07913d52ea9c32ea9c351529ba00e9ba08e47411d5d524793d4f128a9a38beab88beaf881a2ba9a376e4c089f8915c3efaaf15dd8fc066d85675db5ad0711b08b225570bb4ee1d1c90fddc070324be3133b4f25800a499ba19a20f8193d43c1972a7c88ddce34b0fb5453d83952cd311c17da8a63605122aa39d6cca0ab387041fae26cc415b6d108a586ac473bd58419fc22cadf7a402a6a01821795e445c9c6784b24ddc5c6b370fa9b2c87042f70f9c2098017ea8e257821f4740e55574aace27c1bca5a084195aa3fa007b081788aca41e5e982bd6fa456918425ac01dbbd92f977e4a09235bb5da9328ab15daa0a4018434a41610bc860157b80bc28aa52d6683e80a20489b6793ca0644e146c3d4214041ef34d2ee377328e5c6ab38a79323c5682af91ee4b446eb0954311634bc6299986bb9ab0626a466f3195d861663668a67d66165d9a6e89a9ecf4331e8c6509d95c007d972766a1739c300895732265b89758d92bd666ee88199b0a7bc92038c7fd8530f4a34c7d56854e85656e14af38c4ea8aeb54a3e4487a8a8820acaeddaa36baeaae6a4a78eaa8d46e81187cc8bde3c00f653470b88673fd6423dcb065da1795b62d23f05af1187031cde81ab75b540bcebf5457e85378323a2219b0f27425e000d063b7ae8d4af7083f2c4d0f33aa98d0430ee68fc3471de6a90169a7528e7028283950d1159c0fc56e22d028d8173a3e0a2763bdd1e95c3fab9fd53f1e9dce0ca7692d736151215095ce0b4b4d23d49a93de1f887e0cbb6a053efd0eaf7bd7ef16c1f5d0ef16d6e770ffdec505179563b50e7d047ed45a259585558e855a8b3ec22db9aa7c8f9ffced213786cb5ff4698fe7484e7d69b0736bd181347bb3706a4b1335722ac205ad4c7d5b2da92c4d256da8d59dd34d8fd01ee7d16bc65c6569100436277d5d0bb5cdc44bc34ef3fba4df10b8b22b8205157fd7c9e7f74c6bd303dbb44a472862e8fb4b535e6eb32e4594bbbbf9e6b9208e56970269d94957a540d57635e2179e3abd4e88afcc167aaebe1216379833c9c2b3223ea05f41b464e89a94dc4243c0a650c3a9a6a6b614d0baf5acf74bc635be236d8f3758c8a08d9aca4dbef66bfaeed7d3c2eeb07eaf223ea876a5035c877aced4c36f6c7a41309be8d1c9e06e0e3cbecd8816ced015e345d75c0982d0a3e84e6c5389560b488c604cc5d1afe796ca52595747f9484f00baaa8c27e1385139817889f266e8d497da085715f1c0866b4a6d5156ec58665c8786409432a54542e803f7d4754e5065a253290b2290a14d4eb49462315f7d6f4110482750970297b532ddbcc698f72e2edecf9b826113227bba55dbd4a9f16cd803a7619b9f09feb2ee8fd6556a2965058c5b1765c7e3753686d74d3f95d394f93f2c28d77044ac3c122dadb16a7a8f0a9e5c5b3c728e6580512b22c10381297db25c0b2f7770815e37133be47f7a5fc0f88f7ffcbcfde1445034c1ea668b556378ca70cbc826701021ab704411ddb8277fda02ff7883fb7f76e4e7d43adfc476cc6e611c1f29321c60e4091df0347a3e096d4e3fd86cf085f91d813080f3ef90f73c98cddd4cf815f23c180fb4d8335bb24b868980ffc23a235868fe9a68593d96e2939116334256dbc5fcda3eece1c39cab3dc3e631779f24d9c9d662201ccca46b9e6103171fc14a820711ffcd9eba93032c3cfdef2758ab8ab029b77faed5d9af55eb0db6889cae5580211d1807355f1578ef33bca6dbdacd6861d219b6542a318736d609546b27f96204cab66da994cad1a83e7e72a9a279b16bb4b5b5b38daf55f15f29c7d502ab0dbc89fd40e30f4cf8f3695baa785cab6abe10a48f350f09280f29cf114ea367b05475ea61a9cefccfa5fa5597cafd457cd7d9ad057ec6d1cded4596d596f73c50cbd02c27199ac53334cb498666fd800ccd7d793c42522c59d333347799f493199a6c39ac01a19d3d43933d4393dfcad064cfd0947733349b6768f60fccd0849b169fbca7ab22c23cf78b1bb26f1e7efe793e5a0abb9de08a475c82b7931dc1ae78ea89e219ae11c6cd8ac736c991ba6cdae744f7b0eb1e3e61c37715cfb4d8dca9da09bbda014ddf553c3a4cdb77bbee99a7ba67533c2e0dccabfe96e269c1b26e6fd8227fee8d6ff0595ca36b955da7ff93ae1f4cd72a3f43d7d6dbae7f7da36f6f3b358ac8a5fa29ad874bf5f193527d27ac8bf5b98b75b2f57a3f51fd89ea9fd7e439ed5ae15d79be53f51d91be9135be6528057a4b9e77c8f37e23515bbf294c7d4ad43acbae29ff49d40f226a9d3725069d12f557d760f72e2ede2e33f85535981bec3729b15f5783ddbbb878b453f3180bbf7afcd5b3c7871b2a0df8af16d1eea5a7d6a758505b724b34695c2e570f2ea5a632271f2b12fe725340bdf445974a262ffb076e4e4a75f4b2f0e0346b97dffc5c69c30757293c943ef83d550a37d71bd45a48de53d630f2e49b5f33c71f8b47bcef5f27e4fbab1478ab52e8390761c42b113cc602b23bfcf4c09a13af14b95a244704b97489a394242bd74001f71849802509feba6dd640cdc2b908c155fd99325379b4bff56732f27aae81e1f7cfa608c16d26baea6a5a49903da89f5d15db2a76c60d081d58fa0c83812d5083642a4826fd3f79811276644f25224d8103c9da548906825354efc01189b7b225a758ee21458498914b808371b4644cb6b8931296d8cf012c183147c4cdb2056cece4c0b10acc8a16518590b7dfd3f5a878ba2153802c6b4c3795253a53ec88a2af6c31654b8fd1c32d59bd485df5cbd411958c24dbe7bd8b8b877a0a9e817922fdc1897dbc7ab45ffdcc429561abdd53f5fc2e4b6043224ebec52c3d2e7827135d955f91f05b908d37b7cf37f926be3233fe4e58eb26beea1ec6d5a9985c6c10f4f2d314ae73aa002e9ccaca16e42d816a4431093e9eda6caca0ccbd344ad295dc2434361497e2165dc6c1912ccd35759daf92014c8e502d84fa083ac1cda2e86a35789450b78365a935b304c2c08b78c541d5680865d17c4d2de550229b8e0b08865ab2a34eca2c0e2c6a923536a8164b7554d3d57209df3dd85e23556b3a74290539855e7ba84b6b99ce88816e37a6b9d24ce0916527ca6e0e6d264bd9861ecdf556118b55535a4cc1daa4dd46c6817ff5c37db0f424da3e57b2fc1095254e187c1e72c8fb31c053ddb7a82e0e1196ace9fe3dd5ebdd6d1b4bdd44828bdf85dc31ab0703eb6f5982f3661a9ee636d48c7c9d5a61901c39c84e3492d808857c66ec938e9d3c525d2baca116105a27d702b09a8ae7aac769bb17c95c2e45b99941382dbadd635191b1a50f9415894158ad1ec93734ebf3d59faa6aee288b23a5aa0c4bcd2c5e37e0312d952f88de531ca9458461f2ba25ed547d0c59a47ad19046bb5ab688e5204e0804b68cfd15a5046aa5423fe8d8a0058ba5caaf88ed8f005eee961b4601d314cbcff7f423361980307641da2c923455b82131dfd20656378e0526a8399b24f1216fb906c5f4924a12fbcd692f1e2b922af41f1c3ce36b062be3d0c9588e020cf8026121a17b165c433225e40caa35500a4c4865a8f8249f2a92232d7f05f5299e7bc16b337bd3f2dd2c97a058e29eca126327b20c57af8229ab551b50e06a89139ecae2f93096ee5b603f4306e6807163f96deaa2bc8269aa41fbb0669450a01252af4b60140a9eb0f887c5c7c60835e76b512abfea057791758638591f308550b2b65dd3f11a8592fa7dbdf6e248ff27b37fad0751822e7d203c465612296f5f733d86d04a3e5ed7a6d7a8ad915a126dd782fb153c2162f17aff67c64fa1e44d32a3f40b994a39275eba28d79789b85ba9ca68134335ebceaeb3d2b50cd4ec75e4110e14a5f576bc6ed063282dbb7771d15ac5e3082e361b0642fe56cba92cb3a83cd7998ee3f53b81c39be37d22c2c2c72594822c71e24590f55949872d1637a49a44af916bc7b83b425519b08825632018a94fcefd3bf04ceb46d1c96cff2ca9ec5fe30f1e9a9a34faacfeecc0754de43582953a0687b40ccea9e19a4265c6f79be5a6a3a6b0fbf77d48482fa1869fd2ad55493e30922d48c7aa9cf1828a97e9af28252aa832432d4613bd325a5a2570c1df319422692c621922c533449c3a459cb81d8f545cb3fe14ae74ae0df3c6b7d9be514181899f2c3b352a663df17bdb0215fcca4625bc1606890ae145d802c9a47362e4b2948291aa98d291caf6b8ce7efbd9d2f09d8661dab5cdb86121505785598a64a403a18a57ffd16d5e765b5f88af0b8829f8c98919946bebf9a14b555046cba08b71a15c634f2928e2a689253c5dd89b38e7946d9c8bd899f33dc17e4f1e3fe51d5b1cc1ab09cb872179201f5765db514692be0d93e7c6313c4063702eea8f311c23797686a3fd27b187b81e69a816c136e4f5d9d57a78f2f60644ed9312c47c0bb530dc0a25b13d75f5647dbde03b7cb9e00bedf238eb4ebd5d2e1e391997cbd327cfbe798af8c70df6fcf64acb84aba10a3ff5e2d7edbca4f64cdefdb1279fabf9596036ab6de8ee2e31e310f6623ff96c7eaaddad4471df103db437abe9e163d83e7f7c7bc2dd26ac437e6b063ee1729cb0bce7e19a6ff3b0935ada473c5ce563863d3ee2e1f631c36eb7a2b63fdc6f456d1f76ff18828d8f1af6ada8ed0f8f5b51db873d3f8660f363863d6f456d7bb8e58fd8922d7f04c11a7dccb0e9238441a38fd8928d3f8660e56386cd1f210c5af905d47e27ce8f737c538b84695865a79518593400de8158de5b5682c8c7d4c362af3880c259e4304e285b573df5530f0fb8155b5e2dbec3eed380c3e2ad675fbc7cbc3e7bfdc3834bbd6d5e9c593c1d71ac5b6c125568a1a04ed5ab483d9062c1154e03e594e6abb0ac72c111dfa6dddcf9a1bf30f509af0998f876572bc4ca3767e856c180a7a29533557c130e2bc645858f9791ae8f842a87ce7202b3875bca0a002df8e39a8786dc19623f5ef012d40f468be09a726f1eb34185b847769ba172052073ad79cba10768842060531eb6a9c441aa31723567681d6eeb2349dff5e77e506e48b9ebdc1064ccb1f09b2a16fa42a15fb47a3f54c779a4adc46265129ce84ba16325b8bef1934ce17b7a70d947aa866f258d0cdaca6fb11a11f53c464983b76116553b3acced1e230bf63c32855a1d762e49f52745c39691e1314fb8513dc3329c246478c4b76ff782d56452dc9231aa0790e1b83d642b03ddd2362da4bce5436c09195b4019b167b7dc11e68e0873fb53e22e59099e92114cea59e6a45bef1e9e6e70cd8e4d3a995430d39f3ccb1359161eb0453c225a8cb7444fc8409a88951fe2bfc7b19987b25e2b89bd41d676f8451a006f548076a72b3cf851875bf79c00cf5b85973f6f7e69681389b4c5a5375c398bf6185819aa14b628790b0e74b2ff8afdaa67b180d8f0df013963eea4adbe2015de6e0ec763914532688f3e1e535dd98f466535f28be3030c1fb3de2feeeaa7688a6300d7c333139cb696db83300106886a2dfcf727a95b274a6026997bb782e308e118b270cceadab1c68d04804cd86641ae3465539e2733ac4eb96adc6d3439090121e0b87a30c1ffbde50c1182fa793f3a921f344b38fef6ceb247c6a42d07c3a321b491c9c2255bd064bac6c271d455a967403bf52d7b64383a84f87df1dc941a8f01b9874a43e48002896ebbb6ff3a6d7ffc6999d1e0caa933f1c143167cc2e4cd55fa3861737656e9276cde9c65aea76c1b3b1567731477faefd49db1f73d79fc3790968cd53d9089cf768dd9c7c6f46fc991beb1fd293318bb070bf3bccdeed5b7e3588f49a99bbc18b1bccdec5ecfec392c668594edf38810794d61a8b619e2baa6b2abc4a1e77868447e8f1c2abb99eb59137bcc53f581ac967e860043377c13440d2682052d8d5003a11c5680b2b55afe0c0255d103b3b1986c773016f2a273849450728f0014024878580d322b156e660a1603392d0815954812694b3cead898e201b67a2d96fbb3b3449d5a6035d4578b095bccb4a2e095535bb71f1e006a21035269ab6ffb025955ac8ed2726cd6e28ce7a62de23e865304e9a34304338fe031cf6196af8130b0c5e5d82c5d64434741d8ba02a7a8acbb755b215e4bd4a1752f79c53e89cdb813da915644042165d9c36908ceab3488823fe09c62c5ad5d976035394c41409369203886f5d40632badb447555d12701de7042caf748839b97a00bea9d2bc25cc5923b62b71097efb415822a14577628904d7db5f02b329e8201bb2add0cba4ed7ca8f25c52cf3dd1810a46c6fd85c92eabac5cf05a803d3b49ca34491e1c61a400e2020c009168084f02a961e263558a89a8ae7a317147ba30018cfad11201091bba52e4412032bb18497b6010b89e14d30b8863675c226b43a629c5be091c4bd910c6d1dc480ff44f726f605c996ff0641bf5657cb645f2cc04a81295310bb230b2b237fcd227f641b93900562c1dbb187e5c54bc1c5f58fe530d1c35eb13056ee270824d61e4e96fa97b1086a57591af497a7f1fada12407595c563d73dd800eb34232298dd76d1f032766c2b2be8b7d147ab399f911dd4c450a32c47171926c5405518675272e8b18a743dc490c11a6db5a0710f16096d61c62d59062ad2d45ce847cad9e112722b9871d6a001d9f54875f56d8fd4552c75c3e04e106b4501602a0f3b23942abaf77b81252ba267ff23d17e11b19be5c4b08b0120b08d606926dd4fff96f260d9082530a0a8c8ad6ed9c4a8a53a98e93282e1534f24c014307931680f334caaa76fc14c729f03721e0305377775f9105d66a4792a19a609b011871f0c802c52b6640731c9ad6b13c84a400c2c5a0f1b961e0be1ee542760e018d529d2bae5ec54186a0dcab979ce890954cbe6a951764b004695b29319b130ca2defc67d0d03b3cfe6d311cfb0edf8ae0abf6a9901c80e30540b53786be4702c5cb38236da2aef8d73233240516a2fa64e2d47d8b2e8807112b29925ae3625f8c47f097f948ab27fdd142e6500e3a2ec482a3ecb8ae81372216670109fba56cf10a66630dd8190a3412e465aa8b6e5b09f238aced5d23bcd6cedd8d11ca6eed16699bd6c0e18834082355fede069ba2c3b6acf495a9b95fe109945d16c15574ffba890600c241aa59c1ca96bfc69291b3a77c79768c09a01e761b31bba844a158c07c972dda5256f1920dc2c838242a98e610588126c2b1ed841c584790654a31f7d375f1cf084f09768893102a9667076d34090a6ed11867466202de9e4d6b6953aa4061044b687b77c2d8928a28a767631a445f0a831638bae11d873562be0408094d2772bc4322da160b7446dd722782147cb4dd13366736c7b689f0adc0d03026a2b2ae3abe14f217f2bb29da1c666736fc7cfed735cc754fb7959570780273cff49e2564ee6ca4005d31ac9b724769c4145c2be9f5e19e65526e6ec3079c72eef0cb30f7688e7f58923520a3c232e01d90d1f896650f21a69ab1e81cc401dca06eb2791bcb8c49c2f1b4cd2d8ab5eec3ef291762ba9b8be81de59f5a02a38ab00ed723d06299ba31512f491493a1841f8bb183a260cc1860c15604cb4069b8a517e7f24ea2d3d9d77eddbe2897492464853252f06da2ca07a5b70a7bb1fa65ad3b50386c5cf999674b969c3726b9fe69d8d554f993c879f325bb353a6dd618b829e05316bb735379f876915007fb86135cf8598a0218859a711d3eeb0c5a3cf83980d293e9d37d16bc52b65af8b399b3d54e187685312add610449019ce663bab603b13877b25835439f135d613f712fe7f262385cba74d2bbf6dee5fb781f2f90cb354023e4a36a768738886091f49b1a8e4b98cb463a4303c77605f83888c94771efde4b2a94836d9d4a60bfa22ec81abd9ce0312b16471dc1e2b8850731b18cf4089ed916fa990ee1cba11f85236ceed3c86d306a1b4a62363fe3cf853c6087554c39fb5e24ea0c2b2b97f917bde572a8e8a4f1dec6b4eab787bb0cc3bdf6632520db51ba6bc01881a9a2a908b01ab7a1e23ad79a2594c5b6345798c75e43297f730a4ef6ad8e3704bc13d4ee6e53d1313a1d4e253c0f8dddb85536e77cf4bb7a2019a96e731d05de97ca4b2107cc203b1392f2bea51cd07547bb8b3c3dc606225b87005ae7db3d33b8ed42db0956e9dc9cac8a87009b6b5794f39da40eeb173adc078c3592927500ad5a0a4c384eb03809400d11de731b182b208a6e926fe0080e606c5d7ad1d0bced806421aa695fca0a0d4dabe9cc7442413da5a11f06103e5c0c38a5e457054e1550ca574070297c06878733e9ba704d601aed5db0d585719ec28fd3893610e00abf66a81816e38b6c1ea027b7097b449d8e6413684a3cf64f802dd55ab753ce8ee3eaea1e0bf67c30d65e4405d5071392ccce4d9141641ad5ee68a6a0f2febc5bfce63f86a3208a257b26e5c6c6e750ee6a0bca5ed7bf703059e7cb54a634378630418f87c4443ed56512830c3c8e30edd50c2e1473e13e150e17037416ce7dcadc4b78433b2b4ea003d293b35eb09e6dff889b4e0bff3301925995ccd9b8976598816aad5dac399685e1e680ea707058f2c0f3bee2095e75c283911f5accd738ab6e4cae2b18733d93e6ced39ad97c006c8615d72d97bf09cc9488ba573f03c71b41707fa3b12f4d37b5f98cdfbc23cdcfbc2deb657ef9cc718c9bdd75cbcbd70a1ee632c3f55dd50ad599c4cef368dd424f893cfc5086833719026c9fb699982453282f7b53a132ba0a1fbabd49e8a9db2c7067f01ac002be53c17b5a0eb2e0186ec6a9156a40a20b14310517e176af113a959b1324d649a0dc311410b040beb9f892cab1dbd13304c4b891deef81e1e7b3e177aa297010b599e2f1c0b563f546e8444f94483b4766266026ea905b215f69ecf49b01658fed2d056c9b29aab53b3eb71e53c8659d81a78795fd1ee0950d54edcba93ce659cc69c96e56760421b969fc4b361cf82c41fb5a98be7916fdd1c2d13fa6cd853182825c2a9ae561f52bd118632e799a408189441114ad3f35cd8f25c8261c5b5f330b1ac20556dade24138299e20a077ce8294dc9be70201a1d98a42d146a8c0f03f139b8e07524fc5f2388b953219b696f5fd3e1779c403febc821295bd90a4fad9f44ca2c3dc37dbbf796123f7cdf66f7226631cf9ed310e3ab731f6b18d716e63ccdb18cfc57a33a7531335dbadc66903b43b1f4959fb7442f6eca954fb627b5edaa71fe3d8177b6c639cdb629f8957ac6571c8a9b26e5949e4e988c0873b97610e87706a3ecc7a8aa21ece269f42e969c05da79041732b0f3c9f14aa86b499daac4ef1b8f0c5eb20cfc431d6b86cf9a76c7ba8713db394c956ac5d5f8571c97bab77b811c2993026a3ab327a0a9e380fac6d7c897c1eabcd65cf36aeae1e256fab7d2ef69a20c1a85507677564f6b2378738939dc365beb57358e8cc764e6146cf3b83199fc1fadc3a887da019e84c768f77926c76e8a9ae20556272a0f358efb2ed9db6ed9db2ad773b97bd23841e8743c93880a0c0e4f03b3cc299d81a95045d430b6a3107d61a30c7bade259e89bb0dc899d62e72dd6036d80120249ec9fe06ae282a860c34deaa3336bcf2e3c6b90619f9ab363afb3918cabf67c3b51d1ff4d86dad58b9b8d552d20d60f59f6050d10635a30fea97ca923b19145a2ed3d87aaaf0eeaa27ef91c8b06b643f15b06774006cdbbd3e8c8c0442f700de30628095e2adcc67f01613860bef85acb1591dde49dd6f75e81aab09ae0efd72f47a5b9f976a45ecd1c7147d4c8655660d7a82a769a254fa972abb3ba1ac4335ef50a6a8cc169423ce4fd186504abf369e20c1fb127caaf138c2f4de973092437e58eaf32759b57e6d44c147144f47f48b2c923b715e5372f7753dbaaf737297472bf336a6f19d0c6c1e075653df863693bc3db44fae31a54f43ad460ebad9c23d0db472e0a9e735ebfa015c9d1e0093c364187e825afa950db8c3212bc0a7c31056cec498e60ecca05150a26e260b0d203d601e2d967558ae801570c0c35303104ac49070806a12d10f4225bba5af8b7d59bc7adece102648a878d57311c77204d636b573f1c7f0a870c4e91c7b6a685c81d311da5e9466384c30a7546d6d39fa8131db33890d9509379d65faa462c84ad626a37afb8dd5baf264acef006044303c847a3e7b1098e682be3bd635039c350dad021050a897aa08794d6bbd32ad668a93ac15e042649e496b948b6d7c26f363a9413a5b7f1e548758b5116afc0d95aa58ce79031a1059b4b4443a9f446361ef2a50572207712b193d5328941cf996c7b4bb465eb56dcdb9be01c448368812ee91d190c83e0fb122869ee810d9a17fca9f89fb2132e4b7a08601686368c883cd72bc7a95038a1decc320222cd659f52933621956d48664198afb7c3d1b1f254e06f763fe74b1f632f0610af2a23aba1f422ad78af4780a83cd2c3ea2788a7749aeb7757cdef90a14ccaacb9b421b90a9b5130a15a07b86f903542dfbf8b2ccdba75cfe5a88b234fa3b88b2a59c0997df01bef0cb17871f3e19adb7761af72e2e2823a121d3e257bd2d13a86683d35c28034f043d312ece8349fe41c091e139b061663f1d6cf7d41ae7db6374dce938598d170fdbd21e8498fb9693db874afecf049b268bdc8e4407116b06d7dec4d1121f8a1a466fe254e910bb956e4e0376dbaf0e6c8d3ee50020c7a72ca91c28a3472819ae2e7963c4fde24d19c0a73a10f059dfb4d40faab8ca9bc8edc0b17e29949ff6240742ca523f14b54fdfcc432ca1bf613a48e86f0aebdb91d498d3fc73ab1f27acee8cb027c2aa3564d6e79e68697d0621ef0916a4eefd783e3907209fa48c96da215b3dbe41fd4eaf139c9645864e75584fc322d48f37b7f219fc1ae1954eb4ed360fa7d91d955df54cf65ae71284da1b16afb468def00f107b1bc470f14e9a05487ce54b9972768cdda58532c7a29fd6baaf0b8aa48be0baebb55aa1274af86cc6de5109555b92a5f71ea4b17d8ef21126c3dd32f3064425c3b3a7fa064475ca0d9f768cb5fb18ab971bd99db31aa3f04647cff0ea1b688ecc33c9946b3d6fd6a19f20ecce598d71ba7015d9b27c269dd918770520a3bcad00ce658cad79b6944c5febdecb36c63351520d27ed5a86376f46adcdb0061dfe797687c25a4b12a05dcad2d07db535514b8b3b7aff64bfea797ea442fa3546cf1dd8fc32132d5c9167d36baa4bc93d35243adcda56bc73674db5d6493555745acea102551ba8c1db95da3772883c1162fd38e3e5d7a077c925f4aa868a08fa3ce3ba010bfe3c39a4cc9a4ae8d4535f8a489aa17349732979831aa7331c75958291ce3416c1a1a197bc94397527524b63399dd799786b303c13d218a3a76acd9c5c99f473f1d880a43ed2e266a2de9377c7791b8eb833d0bd53d35ba572683274bf09a51e5a563ea81d59d9b35de3e34f366203d6edc90d8ac692dcec21ae69435dace3b661bdbb96ca3d238851c41b44b177e411ef745357832591501df4a5eb09dec1cc9bf592d960d0258d55104740bf189cfe11e2f07654dd609aa67e5faceb3d9c027543d91ec0f4afabe5f3a089087e3902046c1e0129cc71c480db44fb243298ff12591cb71cdda0f30a40460332b756022d7680cb3bc8395afd00b45c9f6e28bf24c3e923f45e61c03b02cccf7a41a866a5bddfd00020bbe5c05147d03a926c9f40d8ee1d803468e57824f7e9f5a393eb33e92bd83a107e3aa5be16efd281eefcb6d8e8eab01aa27e31c453fcb1a3210d79d3062b7a23e0ee187e4c067b34f00c72022cc8e4ada32c892b4c5be5553656dc1a7390752699ab35a19c480b10f4f969684755d1838b3278879056707b64a2bb266919c86a6bddb028fadeb21adbe0fd9cfa8bd9d428facb3875ed16486ca1603bceedf34dfe2582c15a767cac6c583b7a250dec7aab67403b935f9c35f96bad240acda9e67fa8cde13843c83ff12c1a245b9ec7e1b1cea9c42a9ccaea08a925508d53478a8fa7d9dbba1d7bf301bfdc6bfd4bd85abd58f266719a12686af8e6bc35b3f1cccc60189f0350a0cd1b29f6d4228341aba3117bf00132050143246a9550f65663fa34798f9824d1760b3ac578c3926aa89c962d4ad6aa4ed6d8ac4991a741aa0868d74a837fe9aa502ad2da5deb828cc98a35f16a601e03bc6e4e53f2c223eb8d4181adc1dfde2b51f6f67f74eccd6929b5d646c65b57146fe4c9d6bac256ca9a3756f76d23e5c6bfde1d776458b7ad95bdb79f60cd66b014b44f90598abcf820c57b89595e1a3081adf1337c23eb7e635a267144e69bf79313743f1c7b53c86cbd2fb79691d5da9978d7c7e648b786796179f8e3d81e7906efbdb27dae8695096bcbb9179f871cb2372b645fbae26d2eebb684de9595d7ad83a2153f5a3729ef9cd23d811b80165e9cdf1d216a2f39be3d604c4e77b95a607151a5243cf62aa0d32a54ef6be9ad3e9b3711457f9fbd5da8352429616f0abaf5a6f5566779af6f3d5663b6635bd0719d36f1f875714d61ddd268df41c506e66dba3f4191436faa516a9d6f623b9614985960bdad8ead84b70c7ad9eeed9d3fb18bfd8e37850b68261c9bf7f6dcf2ec0d1069eb232c9bb8d93a78e2ab16790cd3be76d2c1d6fbe93a4672f14e9d0329df0cbdb20d7bf830e72ed31c376c2b493e6645f1d66dc7811bdbd60382b11f0dca736f5b0a6583ffde5abce7d42bddf919b04e6fec3a5677d67a462ded22bb6e26cb890928de29feedbe425bd7540a5b6110a2be9f804191bbd4b8fd9341ffc11914ad4bb8fdefc6a0adab21589b9c32e88ec9c14756f446cefd846167dcdaaff3de7119b6259813ac72e44f7613a26dfce9a6c58617ff7efef4b6bdd5fb1cf6ad597a89c716c8e5c8a2d85f636b078d63eed6ebdaa01737fe8c4706b54e679eb7e03ddd6d69c917f8ccf9b3751cb100abe24470068d1b83fa6291534ce2c6a1de3b8ebca1e406595eb63671e4d623baaa7f0a1eadb35897f07ff2e83f328fd659bdf1fbdf8747b7d8c1372f9e7ff2ac9d6ca5ca7569a3ee57f0a84c5ada440fde99d35c3ac393d34b9233cc3e6ac3e6d196366768232f9d2642be92c6b9e41fb5e9d8146dcb3f6a1e0ed1cb31d299e4dfb74c69475590b437edcb5b9a6de77a2e9d45a820cb6ff48349b969e0ab5b535674b96d9602086156ed70b9ddb31ebbde71babaa0226f138a46f887ec8dfc77118b9a6986efb2b85bac1cadc8fd349f03a32131ea471c107643dc44f771f34d58958a8b1b6b4047915cba0fb7d7c6e6ed64c827eb90c230cdc44fdfc55b715b7b6eca26bd2558f7e6638f611f9e798e697321d306a2fbe47078f6f2d593e5f5d5e3e7afbe7e71f5ed83cb6f1fbfbe7af6fdbfe6443c16d50493c6b27fe066974475d6a5674a3c6bfd8d410e9446a91be44099ac3c75f5fd834b92542e97ab1ffceaf6af959a2a2fa3d424329abf5366d717d93be9a7de09d6b5ba62eb4443d60f1840b891d8030a540d0e7bf526c94004888c8ef0de58b9c15f54a2d729c69e642dae359b1f80a6a10fd9329a73a87ae35a6baf34d0329ddc274bde4ca0a4f950d0e6cbc03c45e092950ce8e67ddc3fee92e3d694cc328c96a5d06f2e6fded319ff7b47f8a4c6e56eb12a6e5c4499b684323f6eb6b173ca99c7d2b32499a37ceae99626a96dd32d896f9ceeff495bf3a7dfd9e74d2fd5bb35e5c1bcc05f33fbd8e64a757b2f8f7daed0bcfada9ee8e3f8a9a7398a20dda2d7ceefe3a65f39bd02332df98699f24e6196139484f7abeebf07dfef9dc1ac4b425e058e1b2fe06f56eb59d340dc1a870d3b5520720d1dee3045354c6f6143a8c244477d159fe86e6051c01a869dcf2c9e652075441657153d154d38fa4b446b018423071427e99f6af036fbfaa33322a58d537b58e60852f5f7246788e61ef609fd7866842e8805551c71a057a2d16ea8c5038468af8df012758bb80a7aeaa16f480466664455e37e0eb2941294539fd97c49d5a934b68c826dc6c571ba39f49f9f7247f8b8e013483b30d7aada06e69ca473db4dffbb58329fbc992d370a629d7e8ac18e08e804c01156d275a40db4881e9f48c69066ed63676c331554e8abac18865252079a94c45e6e7b76baf3c6c205ee27e6d5c00e58c76b678b1a0b4e256b6c26062321ae0a680b30151a0c024c240dab6214e59640d39b683b52c40cac278c198a87ac951b7a18697a1b4bf17695e741131e2d545d48ec86500a02c1123a08647a28275a5ba0623804141865e0c3b018dacaa67c4690b6617ef46cfa66acd3fba0b3f7069916073993c9d7a9c7605d0d5df8a9fb16f950debd19701e629461eb71db213523418ff2ea6db006ba20a814180005a9ab959cce882c34601000234459a27a16092047a0989b45e0d7e1476d36b8b1a2f4457fd673e9cc4d288468a2ec3290e884aec5608e16c1f88cc852b56433ec37efce4cca326d9d6ec43070473cb3cc90224784a9a2bb11df2f40ae1db7ed7773f75b053de7eb5ca12eb29a4c338c58b275269fdefadd1acee83dd54885ad77ed2db11aef1e274300a932d240ca2d6f96e6b0a143b4b7d540627a30c4100b26b67399c3696d51f449c46d12f13889e8b388368b787d163f75f4c16127fa296bffb0bb85529b8d97ce89a5743f73a90cad1f7fe63abe783b6c9dbc7690c8d2736a94e7273c74d5526e98ea0d87ae4fbe63a543c490dab2bd6f51f83cc32861587ae93c97b1963130d6023bc3071b6db0f1dc062b452d611e23c93a1d698d2d760600bb6a59afd9daecaaf89b2ad7550f009a6d35a82d32a02dea11757534d1546a4011d728d38136abea45fd23027162901100138825072a517ff2a1d8cd81ee6930eb747c144ec67a1ec4f39664aadb570377c271a1a075910e5e4f6c75acc088f28e466a910163c7e836cec5a4862c5093daa0d260536f1dcd6b804d5d5637a9813905933a1c4d6ab7a8ed242501a041d37253cca48e629cb519d4d12dea0840b6ae921f09edb74c1fbc738274ddc666516f0675dc0cea78625047b3a8e36e51c7a3451d37933aee26753c9ad4d16d6a808ca1f4852bcea172efe296059e774d85960568aa03ab0fbb3ab85d1d8e76b59bd56137abc36656bb551dddaa8e9b551dddac0e6656c753b33aba5d1d37bb3aee767574c33a6e86753c33c3ba629dcdb076bb3aec767538dad5665687cdac8e47b33aba5d1dcdae8e47bb3aba611d77c33a9e99615d07a9599d18c09740679bc110fe0009ba6e6675c4c993e0bf81cba5de7601efda11c51315164de5a0ad0cf09675f8aa0d1b7ca67c885dd7a4af641d943994cdd01634036b2a4445edd5e635202a2981604706510de78a15c4946a59f17af4aa2624ac5f33d2cacb3aad72429455e0e865bc25523b44ecb7beda4117720a421a65d9ca2bc22b0dab461886488b534e29b14a6a883d07642b17b87ff45fd6d56120d6ac32aba77630f8c1b6a279a92a0965bdaa4a8d62c5554f7230ec42320f1e63afa2a52ccecf4a3e396220a7160bdc29a467f0ae0683d94a4569826aa86e30b896fae390df38e44cab11840c2dde68d1009ec51c5e9e5884d0b6d51aea0a7483dcedaa86b19d1859fb34941d07a01cd502196bb4a2268edd9a096f7e5352a525488c19c0aee408da6e1521c0c935842b31d83c8c5e2c433c4eb811947322e5357283579363c5e91bf487233383e0c8c65a235be05e6d28207d82dcd1c95d55bb9a3185f6c2142547c2be026175ed504061852fdd0c38e070714df521771da54883f4a9aa902b62edc75df021d180f7644ca431a8dff1fea4a66295465fdb8c1d1aa8b548d4b03d8aae8e5e3f6c9550be9f6a186c7d4e0bae44661a0ff5aaa9a40af6c5c1135edcae57f72e2e1e72613c300312e2fdbb68fda73f701ec2aae6a17c5d01551a8e1553239ac16e1d6f507a404813e99055aa802b36510bd82e64358c96865256490d6125ec1caa5bbd2e37d7cfd90cf719bb4a811237795094d5bdf0a5ab5103390fcba8fa53aada99f5191d4c419f0e4ae56089bef045a9d4817d1587c1cfb1d7f5ba1550f53146e950c1f449f79801fac275a546054ca9aa2ac7ecb21c81cb4c3a3666734995359b5304855bddac320adb340575619b3dc38e871c40a1680df43bf25d2a720e210a2c49d18b29a3e52f4ae203321aa1fd1a248ad80f4e7bf13067a2a0b08fd8e0bf3a5427421e1cd9e48e037516544a75f7ea36f8e05057a72303bd903c09d1e44577ae90a18d5402b24b52b68a6db6cebfcd4c0db8eecc110390b711dd64357432fc5eb776732a46200c5d375514fa4928f8b3174eead1ce4a62b0fc367beb2baed354bbe661cde8918cddadd72570635cef2cfe1182280f99777d726e40d7550e6bae82dc7d0c4f166dddbdcf66c065aa08d301fb787777f7b5f17e7a23b20346bdf7adb80c7e02353b86d51e9fc730b9d13fc2302bcabf7b56a31c6609b0f619e272335755229e891ba214b5546cb8711f6fdcc71baf8df777f7bff9fdbd7308602349a10669c3dcc3e7312680a14a173b5bfdeefeab37dffcfedeff1f0000ffff5fe69651a1010100", "617109ec9b8616e0de6f52cadc0ad126": "1f8b08000000000000ff5490cf4ec3300c87ef3cc54f968640a2aae04ad20b4fe22d5e172d69a6381b428877476bba35bbe49f3ffbb3639cbf601758d5524edf343c01eddb2e852ebaeefd638e006663b14f192fc7374451e551f4157ec23eb01ef08b4de51a32ea381337bc851e651c2417cc6b774d3f623310720ab2c468cdab82a8635b0c30db73296942f93989a57aa1fb3021a9101c17ee9cd7e8ef520267cf5de0ad044b5f33d796058c9e78aad4c13b2793a592cf42c373f151f4d3f457e0a195beea9b597be72febffe0efd6fb7a5e9065fb0f0000ffff829b6c549e010000", "63b59db05ede78b10cb5f7da70d5553a": "1f8b08000000000000ffacce410a02310c40d17d4f11ba3707f00e82201ea034510aa529498a8c43efeec6c185ab8139c0ffbc13143a435c5794ee861721ae782bed396ad2f266bc3762b52cca7362564ece84367266b318005c53b39abc48fbfb5c553aeb9cf04a06dfe6316a5d601bc5b00f303a1d03d8467b01c4e62acb1184df2a864f000000ffff4c95c89e87010000", "6636bf271e9c01d1d5f067708b9de426": "1f8b08000000000000ff8cd0c16af3300cc0f17b9e42080229a429bd86341f1f85ddd6055a765763b53673eca0382dc5f8dd470adbd86d275dfe483fd4287383ded234ed70a42baf359362c1360368f4b63df01d62acfc18a6ead52bb655277e6449a9d9e86d9b351b656e6d9635f90e2e5e86172fc5effe9d644f131f8dbb5a4ea984487d30ded5df7b0f34f057d6d959c8a6d451d0c5aa848183f6aa06ecde8e274c2b88903f6df90e469260c816186375f1562daacd82a874182cae7e4a6bdcc7c9177f39189fcfa801cfc1c139b8f59dc41977c5125051a075efddc5c88035e07f6178f819a659f81f9670f6ea5103eec9f56c176cde664d0e69999f010000ffff061f56f169010000", "69effaf8141ec967d8eaec8fe3a77d60": "1f8b08000000000000ff8c565d73e2b8127de757f475a50a3bd7d855f7d153dc79c8a6a6766b2699dd9dd979002a11761b448ce451cb4e18e0bf6fc9923f80646779c020f539ddea6e9f562a0569f886cb92a54f300585df2baed0f79eed9217bc1b599b0f855c0e0d56855cf6bb37b2dc3996cf45b5e262689aca7237718493b2d9ee919fb8e03744b72f5ab1545f82b75cf0494a34416b7149c004cf915e81b62eb7cee2027a532013f74b92056abc5957e28906f8718b4f8dd9443abb49da188e3b96afab82e7bbdfe83280aad9d9d09b87ffc86bfc030bc9b20b70e7bde035aac6c6c18d67874fa5c8f9aa524c4b0553d88f005068c59112c82b916a2e851f9865809aa976d3999a0f2bcb82a7cc182630738b00e3281632c387adccaa0229de7caf50ed26d586625269ac182f28dad0381c2218116a8a53a278401b514abde1c2fe388e9a8769aa887622f5bd0e7e1d5f47d75e10e552ddb274edfb26e85d00d3ff7741f31cec2a4ca7d39f790e3a1880425d29e1feba18000ad4f0843b9836f9d9450acb82a5e8c7fe3c9a3bee79ec934a0f1b3aa44487950ce671709847be26b34633962eec7abc0a613c0eba48fd27dc45a499d2f48debb5ef3d78011c0ee0c797d8ab98079146d2dd99a790b382f0e767e0b9df5677f684bb85818aaa2886c8d37d98354e163f211e82a2b2a2b58bcd96d13e2cb2351d011c4303b7ed4a7e1b83e940b766dc3b07029f5b018a3e2b59f30cedcbe0efaf12f06ce779e1e677f3ec178e413820784d45fc7dce0b146c8b097833f35c44b3540a8d42af19ad17514a74c673a163fe6c9f2bb94da06b502fd43201cf3b2e42d81b69fb2ab632e339c72c01ad2a0cf94a488509cc3cd390d7d75e08dea6fd615e9feb6b6f01a78edb0c7c942c43755f9afea5f61c4603b7fc073afe0c97d52ab19d719686132db409b8b309684530da9014e7a7bed441df5676f16e34acb0ab5e57612b0f2edaa1e4b88a3b58db82ca68c95066fade04307d9f403c8fdc0b71158783dd8a7008349fd76a1e154dfec213c33dd8d5044c4126f68f17826ce3de93ac548a9f5869337c3cbe4940ec5f320c08fa576cc0bbef0face9e5fd551cda337a7ac08f2f69516598c0a91abf4eb3b1345da84bb6c4a2e37a83ea8d90fc6799e707f3f5bf83d6f981ea55e0cfdfd7d379f6df79d47e05c69f8dba529dabd71951ea7f2430adda32bc16949b8b914292458d7eab0381c3e34b29a965786fd5e23fa78b576f84b6927df657b25ca3da743568ebb87063abedfc65c58beca619bf97a3368ee1eefecb6d02bfe6b093153085b06635172be04415123c73bd06bde604426a58a2d922d4e0954a96a88a9d17c2963d614b47954243a5e0c3fdc3eddd5fc0a9b16fcd81113c2eab3c6785b4b13d82ac51299e21c1ddfd2fb706d5b235de9fd74c638de78c5a8254e065586321cb2d0aed450dcede3850d430356e53248a50d4514b6e86da09cc4987517d7b4f195c3bb6d2b4228a3a1c8c995d7272a189dc3cf13bad92952e2b9dc06bc26e157d435e0825d3eb041eaff60f0f195766ff1897d5b2e0a993f0c7ae0f9ca09d39ee0657d8875b15786675227ebdad6bd06438785f340ab24a311b479ac6218c9beb53f39062bce8c62ef4c3d7cef4bab9e49c64168296db06d4066ce7b351f4f38ba5bf67658922fb3355bcd45fd8cac954107451374a6df98641d8b23737598ee69269e84fafbc7e1b8dbdef76e3a04fc01259a579be7343ab7f0bb74cac4c62f74f88e5436e6a452eb4dea82b7b2ab7e6fcd4cebede2495db522119a7c7d35406dd314ca28c606ff98fe67a386c4737605502b3f6a88b6116ced3731c1d4723db00911119a5cd95e6a43d060ae107a3bf030000ffff73bc7cc3690d0000", "6b9404501bcb97dedc55c936193973c7": "1f8b08000000000000ffbc544d6fdb300cbde757104633a4401da3d74cf15034c150602b82ade85d899858982c1912dd2c13f4df07f92389b734b7ed628916f5f8f8449209f9061bc59d9b2715df615a201768937c04c08afbdcfba9a9c84dbf1a816afad99aba0a8165c57d3e6299906ff988d5aa0750d2515a6b470785021a4b6a2535b6704ac605808de7a0a4fef162261af77d84675ee2f41b3a53db0d86b0e2544c6eefc037d83348d6a4614d3aadac2cb93d24e1163c8c5b4480478b9c109e710f43ca2b6b2ab421749121b4775816d9b0ac56f968c488af15f659b446f34d1d5959a168f953d426eebc07cbf50ee1a682d91cda700f44d641da45f21ee4167474993e9ab234fae5502124843f29397a312a72efa34f93fd8abb0d57f21742d4988abc87422dba3b03a305f8a0d7aefad8fbc7b5a3c9686dc4e1a4f9d658980cd579e5f6913bfc2ef54e6108b720355cf458a9da7215c2b9e68c6cbf3d2952be2bc95096f29a2e2dbac8236bef6fae309e7a1fa186f285f8c82c23919f073ed7edc28f36e2d10018b446ad546ae5aea0e4dc6550cb8342fe836653cd1e062e2b6e79f9b408617659f2638a4f0b08973a41eaad49ee203ef20c925789fbd814e37709a2903464d0f5c63f61b7e7564bbd3b115c0a49d709fe770545ac599bdc412238f1b4442a8c4866902c965f962fcbe3c1c6e8adb4653c79b008075383ab2d7e3a25b74047d61cfecaaf1b9227f354632cebfbe77c2c753dcbb26600c5e1745686b14bd20d6aea27f4780e15df49cdc9d849b793463724bad0bf030000ffff7c6741bce2050000", - "6d24479674fa9f18b2c966c41ec7ff32": "1f8b08000000000000ff2cca3b0ec2301006e19a3dc5e22aa1d86350a214e991897f82855fb297caf2dd5104edcc57ecf6b63bb877c9459bac68bafcda18443e965c958da2a94fbb217a7ed2c687baf72e313b04b9d908596a2ea8634cca97bf9675e64e2795ab551b26b3be7ce3e371025c63cdfc00fb58022292c29dcd4c83be010000fffffc832c0893000000", + "6d24479674fa9f18b2c966c41ec7ff32": "1f8b08000000000000ff24cc310ec2300c46e1199fc2646a19720c365025baa3d0fe94883a896a778a727754b17ed27b254cdfb0806bf5b998fa116ac3df5a238a52f266ec0c6a312d8ee8bda7893b51bedcf28cf5b14743cf47f6acd5cb61fe1e047ed872c1d65ad773a593a8bf86b8766efc44e563c70998952df30b1ca5ac1024c37c763d35fa050000ffff799e96f298000000", "709da3f0db2b11326f25fd99c4035c2e": "1f8b08000000000000ff74903d6b342114856befafb8afc58b2e83032917b6d866cb14c942cae08ace4a6655f49a0fc2fcf7e038c51248a93ecf390793366f7ab2a80df9180a80bfa5980905304eb6900f1307607cf274ad1765e26d9ce2a53aa7e73836398fef0ffc2fa0544f968304a0af64f1b8963cb74b2c94ab21fc06b65b29d51f61017035183cdb42af778220dc6d83d45936af4f1ed0e68cfb03f69447fbd1a5174fd793ffa49a6d11c794841c70dddb10c17fc7f301b952a3db0c2e2530efd6ec7f070c7e6e8d8cd449939e85cd59025b00982eadfbff5d52e3fa71bffdead050d6f73dd52068405d242cf0130000ffff7b2fce9c7d010000", "72751874ad9edbf6b806613c6e298ddd": "1f8b08000000000000ff9454c16edb3a10bceb2b064c60bc57801272281008e9c1a95df790c6aeadb4e849a0e4354d84161592321ab8faf74292e5c449d3a4a715863b332277c88c56c652ea72ab4a1f07bb1d875a81ee109ad2bb707499dc9704561ae7a525c750d701c0214acf257954e55278c260704054e1bcd01afc1e3deb4ef35c2b2a7cab4fdad11f4d36f7ee4eff9b434b39122f96bd802ec01da2ac527ae9104913399b47a7ff51be3660bb5d673e2ccb7026f25b2169762beb9ae117f2ca832fc12206be3afbbf55cb97078997a86ddfe676a92c7889b2cab4ca23e11c79d72e4983e6f77905a9fcbacac2dc6c2269b26ab512da444fea11c5836f11466118b630fd2c8df5980d93cf1fd86953e2d3c9b4a951a60a1604ce0b492e6e9b3d391f046153f85658176370f80e80adb04a64baeb0626d3747cfd2d066b7ad85b0301cca68b64321f2fd2d1657c7cbad76243e127a5a9aed307d137a500f8f263f1f52a1d0d93e1e570317e55f981329f4e9374365c2cbe4fe7a318cc1ad33bf7110192f1223988a737f3abcea0d11a653756d7350b82134c8c1685c496ac53a640be362a27ac49976483b072c465dbc1d546488a31780469d19e3fb05febe0780fbfc63ee3e7cfa867e1791034ec666027f8b81685247803767111e3dd336fd6ac558ee0d7840ec2c4f4bb0980a7b4ceb4451f07a5cd548cfd761cd9adca9bd4bc1491e341f2eeaec6efff3efd67b9e28757a43fb3a319f60f57d7babf3add3ffe0e0000ffff943495a3db040000", "73ebe94c550be297aea1d1d45640408d": "1f8b08000000000000ff8456dd6edbb812bed7530c74651b0e756f200572dab43907ae63543ecd0245d130e2d8e296e27049ca8e61e8dd174349891d20bb178664f29bff996fe464f55bee10641535d99065ba71e4234c32807ca763dd3e898a9a62474fed762b0d1568f7c7fcdddbe1c9802df90a4330ef209bc3d58860b4935e3686763bf4ef0b9c81debad05a4fc6a02a0256adc73ccb004e27d05b10e4621037ce89071deb3539e83a163e9d5e6fbe924213d6bf775df7afb15d3972c5f06b0e796f07ad82abaecbde08fb5054e4c3fb3a9f8b802170ea1953918d68633c3a7c3f0967a03c9b665951c0edea3be8006d400591a046e3201c74ac6a0818a3b6bb004f926fc9c2a1468f106b6449e99cd195e4e2b38627d47607beb5023ee156b626f269ae708f865c8336e622db4b9f2c5e03f782f88271927fb9ff75bbfa9ecf2fb1d38495cec16c0880b39d5cbe718e55f7ce4863c0531b3180b40a1aad94c183f4c84d0483284b859a5aa3e00941e1565b540236b50eac29d60816fd1ea1421bd1036de148ad7f13a5c88a828fbe51cb79999f199bc3ce53ebc21c3056420860071456467a54b0b95fc3d507f874ffb0621dbddd06a50ddc64476a412a05f2dcf948f0289d7b8499dc46f4b34119a758b28a646e0eb196b17f8783360656f71ba8e51efb0b8b87339d1c2f42904daa1e87ed5be4503d066a7d353a9c620d20031cd09831e8ff469026d0e076523fa6dd23543556bf5181b62999e4157a7e3b5e242205ff5872a63f6b83e191bd90f0f166f3f1eeea66b9ec35ce2110e838164c9a833c727bb1b033b24205468638da4a3217aecfd9771dfb8c388f7bb4a3b3ace3a52c29b30c8c0416f7e8b9392ac95420b26d6b2beeb4c9f4a201e19401178d1bf3fa1aac36e904fa83b1dfc40a0f93f1fdde25af7a18c0addd2f7806e6c3ffb21fe23292c7058c232d56ad31a76e04ad3d3e488f61013f7e8e7a87b3512f53800f6298bdc954dc49ab0cfa5145f7c6e04a36b880fcd73997f199e0d274ddafc193bc17eba6597af2f8b5911a193567ea081e95f658a52496e572cc85f87fc04922e9b25c4ea6afd24bda81c7bf5a0cb1276e8ce8034cb6daa4179eb7e3545ce839e36eb11e6596e9ffabe21263df0f83f281eb20316224f85f79bfbad07a4686a264223a1bf5e2cf40361fddfec765908c3f78e902a0acea17fbda8284e8a50dfd821423162af15d9a1627797ccea7623273e4c447b216136e3ae2be6143fbe4bad2413e191e6a1dde6486f788d8bc5a9934691d894fff994e47df79c1f4fba517fc72bb99e4453e873b6a70e812062788c7d87acbb8ac4b6c3b16b11fa7f1fa82ab980c86dba119a4056d2b6ad24ae813924867cbe3a603588a70b7d9ac4b01791da35b14053ecbc619e4a595c3f587fe3cbcb938a3cf57fb8a30c06c6629ce668036a5aa2c97226d00e6f10b12870d81a2e4342b3b70c754d4349ca536248205e7e9f9b880d183971d2a347fc4148aaa5024cc902068c82368bb25df242b67b2ef7e67143dc7bc0ec90b7b7c7d89ed33234eaf65193f7bce20935edb25cd94e5f2db508b45cf3abc74af21779e549b3a6518ecb25cae39923b940a7d584023dd8f1079d3fcec1fa7fc8fabcfe40fd22b54576b4f91f2c5509e3cb14a37cdbaecef000000ffff2bd1c1610f0a0000", - "793124cfbcf9ae17892b017c666be8f1": "1f8b08000000000000ff3cccb14e042110c6f19a798a0985010bb637b1b43d2d2eb617c4d95da20b38ccc618c2bb9bdd906be73fdfaff8f0e517c2d6d025bf917b1b87de01e256320b1a505aa84a4c8b06507a89b2ee1f2ee46daac22461e5e9ecf3dfc4f4b347260d1660de53c02b55b9bd168939d5dbbbff8e9f5ec8083e0ed15d2d36508c4fcf38c6ee42bf462c80ca45ea111e06d03a28e2f3f748eeee5950ec2ef98539b321660b1dfe030000ffff4d5ec109db000000", - "7a4cf344aedb69074260e6cef71f14b8": "1f8b08000000000000ff2a484cce4e4c4f55b051b555c82f2829d60bcec82f2af14bcc4d5550b5e3e24acecf2b2e51084b2d2acecccf53b055502a33d033d03350e202040000ffff53ac591538000000", "7aee976b536bb9edb3b5ec620565cfba": "1f8b08000000000000ff74523d8fe32010edf32b90eb65623b5e65956a8b6baeb8eeea48188f1db21838c0f9d069f3db4fe038c6bbb90ecd7bf3de9b61feae08c914eb31db91ac1eda96499dbd84e209ad135a857a0139e463b5672296846af002473756a5e0a85cd4f8f5f3f75873dc0ae35db623c18390acc153209cb1368c7f104acfccf3432493e02d64b3c00da1d458dd59742e5b11f219652d1aed84d7f61ac89df087a106aefb75a7eff1d78b311a34a81a545c6092a5d6da3b6f990922156ca09872186d0cda30d98e64fb028a0aaa097b6fb5f5ec8c4ef7b86eb59adeb4b51887dfbfc2db2c75fc33e018f3b681ea6b9d0ea3c7ad8012ca79c0064f3f9e667eaf598d72cda58856dbc7a72498b6f85fd05874e829aad3774a6450a9598336a26f90c36bf6b21a61ee5c02de8ab4152f463b4ce11cb6b137c2ad900bb04c7b3b6d0e688fa9f83e877c5e95634be72d1473b7f357f9c5b8dcccf060e5327411754750999e0ae53c9392de2f8e1a3974e37557f7e9479d4e8af67a744f78b70212c35e2841c3aaf0e22de33e21ee73a8a09c88931097c814d5b5d3123d527e18d4877bd01fba5c9beb33f30a5ea3e642f481e4dfdde2e16cd2154e981427b418b6f530c8cafbc216c49e29d1a24b675b7ea9d20dd2f06df7204509793ceed5e7ea5f000000ffff64e3e7006d040000", "7bfa8af3a48357849c69805d49e22d8d": "1f8b08000000000000ff1cccc14a03311080e173e729869c1229e95df0608b5814ec21824719b2b33598cdac99c941c4772fedf5e7e35f297fd39991b215690a509655baa16b6cbb2fb3d501cca365f4a478f778536914e380efacf67994858fd4a6cadd07fc834d67c5fb07248d2fe9f4e6ddce85f8cce603c086343efd0caafe3a8ec9c8869e5eb7d859e341260e37729066549afa6bdecbf41b93f5d2ce3e6cd17d70cdb2309ae07ecc33557101fee1120000ffff2fa22d1ac7000000", "7e882a42175bb172ad7014ae8bf629cb": "1f8b08000000000000ffcacb4f498dcfcd4f29cd492dd6e7d2d2cbc94fe74acaccd3e702040000ffffe55507d519000000", @@ -66,33 +63,23 @@ var _ = func() error { "87a430673d7bde399a1126daf0d7c0e6": "1f8b08000000000000ff348e314fc330148477ff8ac3ca9030383b12030b124b8580bd7ab8afa9456c07bfe7012cff77948a6e77a7d3ddb791ffa285415e434e624c885b2e8ad100565934a4c59add2c412ff5d3f91c67d1c2ea2f65be16ce3f73e1ef1a0a5b3399d650282d8c81f0f008f73f8cdecdb9268f9104f74fd7f0bd06e5091f2c7a6c6d70795371078aecde58722d9e7bbfa9636b18c8bd92785ac32fa3f771423300897ba6b08ef690152f715b3972523eddd9c9f41d87d3697fff0b0000ffffd638316cea000000", "8ce13eeed27bfd94470fb7430910bf43": "1f8b08000000000000ff2c8d4b6a03310c86f73a8536597a085d9ab647e8054a311a5be31864c9f8119adb974cbaf9d0e3e7fba9b5d0cda6c70d4a56eb9cc26192b80f0f0eefacc93a3814cb2f0e704863f07c0e6ded522238ccbd1ce765d6060ef7a2e0502d71a89696f0f3b50d1ac3458a3786a25156e214f877b28e627ad66dd99e64bdc3be8aa4d068defc297ded89851e1edfae571db017a5fe084a953dbe5f3e905adbbea8325e3edd998768b592a67008e5e1f1fb075869170ed1c4faf038fb6210cbff967d1d0789c15f000000ffff20a0099817010000", "8fca3f2f698f93dd31db24828b9ab0f7": "1f8b08000000000000ff2ccdb10dc3201046e13a37c52f2a68f00caed266058c023939e690392ac4ee511257affaf46a887bc84fe4939336223eaa9c0a4b80c9acafbef928c79265eb2985b72c570dddcc18f052b5f9b556bf466529edb167cc69c811a55e22b8b05a8741c025fdfdb7b2e10fbed83a47933e010000fffff34f28648b000000", - "920fdc8a8285bc442cfb791bcafe45b6": "1f8b08000000000000ff8c51cb4ec33010bcef572c3ed955e5481c41bd8004b78204e2ee868d6bd5b12d67034151fe1dd9e5a11e785c6766673ce364da83b184f38c3a989ef4fd07b02c00ae4f31334a4014d6f17edce936f68d8dbbb1eb8c8f8da510dec48f74f2e3b0b7147e5198f6909b97f33f3c0428806e0c2d6ee955c6c403aeee12bb18068572559fa16f2950361cf31a29e79815ce8068f162834741b9550088ae2b8a42142bfd64bc7b364c525d56fc6c83c1f97a8d9889c71cd05653405c4e0dacbe8a93ac35aabf2843eee2b4357dd950ac5168dd7cad7be37c811ba63e79c33408f5bf50c496a71258f72851d731304d2cd591d30fc452943e625d6b15dceac76cc2d0c5dc53969fdf7102b63ca922fd8e0ccec302f01e0000ffff7aa1c8be1a020000", - "9520f324d82a6b9cf6f4fe175e5ef1f8": "1f8b08000000000000ff9c52cb6edb30103c73bf624b200115a8148ade8c3a409336c73470d1e650f4404b144d445a1a4bb26960f8df0bda4ae0044e0e3d49dac7cc6876d6a6bd33ce623b76007e5c074ea840c83650b27f930410f2d3c91cc33a457d3364e7e9e6cee1c979e32cd143f3d4fbbe0a9caecd68f1e45c8290cea7555eea368c8d0bcbdcf76608fb9db7bb8d0bced28b99b8ee3f7c6cdab06423a102f863189d25cb26d96febe403459c634c9cdb841b10674765e9691444c70f8b4cb80c6180ed06c4d498e1e99b8b9b6d0d5b80a67922bf1c3b64bb661b2da58869659f5ad8867134d43d135be6e778bafb137db91fd880f811ed0c11e571376b10bbef19ca479c8806c9dee3ab0b8b4c5f67d8676a553b7678f68cb146c32ee2afdf31b12757a1650e5c8c138cb339ee0ea16f6d5a6422cb6a0a83be30ed9de390a95355052084ef5f9e414fd6162cc1f888f565577d1d4b886dc173759152241cbfc3b5bd572f09a767b59753d6dfcd91fc3049b0293395f28e4308d6b73ead94ab0ef8e6b80b9dbe1a9362bd0821fd17dad465bdc8a42a10fbb4941ba0279f5455400e92a0af06e3a2aaf44508c34fc337eaf4b89b35ca8e1fde7326595e658dbd19a2ad5172a6c3d005c67b9f5621276cd99ae4c961ef071b313072262a852997515680c77d2eda3e77dd94167520b9822dfc0b0000ffff208f974433040000", "a3279e1c13cbf42277bea34ba00e2d17": "1f8b08000000000000ffb492516bdb3010c7dffd290ead8516629bbe1ac5a35bc2286c23d0b2f74b74b54565c948724b26eebb0fdbf146ba32d8608fe6effbdfef77482afd0c078321ac458f0de52da1222fea0c40b637754a85eb6328be3845a6d879d793677e77dfba1759b63775264ba59feb2c9383597a8c0e311f6c8847430aa62f6d8db634b71a7df6e31ce53a5237e500f2720d46dba70777b5acff8a1d15dfd07fc4403b337834cc3b8cedd5f50ad2d45681d8470bfb68736d1f9de06b48703917027cc0c3134407680c9c2b7df26ee8994f8b81e719591afdd7b0a4743c035ece35912638cfd06377b761ae5e019d2cefb56d0c3117771be0b72c5fd05b6d1bb182bd53c70ac456e9386affbbc05bd75e38fe8b8342db90172b100a23e61dc5d6295181d86c3f6f1fb63f8383b38fda776372eb098e6e8030787aff4b7e43217a777ce52fcbc1d4599612f871135cf450ad6126bd8dd107c89933d94f1363816dea94e0a25ffcc2018dfe4ec02ccb535e4d174be9e24fc229fdd6c1d3d392655f8f3c64d5b43bfb110000ffff8729a39981030000", "a4145ffd5413f8f3115dc808cae80c3f": "1f8b08000000000000ff7c8ec14ac4301086ef7d8a217441c18d7a2d6d61d9931711ec0b24d9e95a4c9398996835e4dd655d1441e96d0efff77d933344e58e087580a603e90393dc3147826d2955ce308d802f5007b9f7f3ecddf01e1004e3c2e26bd16e3a18e5800bef22aa411d2f44ce7590f76a46f9a0c8283b7d6029e20a72f46fd4c0ed4db9844d7f72a3255ced68efedefcefe09cdb3f6cb7a273973dae1a1815159c2bfbdb3edce85c42baa1fcc1dbebffce7ac5a9d98bd0363155127343bd0ecb6948c412201d15bec04253d4f2cfa47f58aedf519e9abcf000000ffffdcd8bf6980010000", - "a61b972dce26544398f591b4e2f715f3": "1f8b08000000000000ff548fc16ae3301086cfd653081d16693172f6bab0a7253d95b484400fa514c51d2ba296e48c4634c1f8dd8b1453da8b0edf7c9aff9fc9f4efc6029f67ae83f1a01f57b02c8c393f45242e59230812b96005638db08e4ef9a8fbe83b1b8f7918cc183b0b215ccb5b4cf1d34a8440fd09bbba65b87608e7ec1004538c0d39f4fc00895e77f02189ff5ea3f441f19935c8fffee3abafaba1186b6ccb01eba8a05f0f13b918d2bc28d6a0dec52d62440988c5c51c8ab8562b3bf6390440a9ea4c3f393a495bcdafaf85ef7390aa6248b5446190f24849deec7b081221e9ffd17b13de52cb37ea3bbf7323a496ff29f670bb6385cf9b97226ecfd98c52c0c5f869044d17122d1ff4ce7828d10bfb0c0000fffffb4a36cd9f010000", - "a676ca891e9d7b9f2f10d3a887fc812b": "1f8b08000000000000ff7490cd6ac3301084effb148320c52ec1a6f4169a4009bd96d0d25e4a0f8a2c2b22966456522e21ef5eecfcf487f424d0ce7e333bbd545b6934946b88aceb0327140400a275491001e2613247e853ac565d36d6afb60693457df97ddd044ecfd2694c1662d01b9b36795da9e06a13d6b96d6517eaf3db8f8cf85718fbf6eebe5661cd52504954d7d8698e36f8a56bc0ba671db54f1169a3cf13a8e09cf40ded24ff54cf713382aae571be27e02dead970d44926a6048cc167102a336b9f2ed8d0e2fa71c3d24bf64f33b4d9ab42b906b7bf9ca6906c223e3e6362eb4d09cd1c18fbb1d0d6a56ac5d6a7ce17e21f83ebc6d5fb3159397258a7cc1ede76041ca674201ae2c07a9b8a7234bb4a59baa67a6c9a53d4e2bbb0920ef4150000ffffe257d10308020000", - "a95877cfc2957859690620af727512eb": "1f8b08000000000000fff248cdc9c957482bcacf55a8ae56d0cb4bcc4dd50bc92cc949cdac4a55a8ade502040000ffff8a41cdb420000000", "b1d40bde484869ff2c0f5cdb619be937": "1f8b08000000000000ffecbd6d8f1cc7912efa79f82beace7e590399c98cc8c837c3f48145c9f6023cf72cb05e5ddc4f06b74489bcdb228921454bfaf517f14454750f3994a8e1c86c9f630356176bbaba3223232322e3e589dffd8fefbf3d2c6f9e5cbd7af6e2f9834b4af97279f27c7df1d5b3e7df3cb8fceef5d7715cfe8fdfdffbddff15e3f2a727cf9f5c3d7efde2eab7cb1fbe7af15f4f967f3b1cbe7bf51ab716a694530ecb7f7cf9a7e58bef5fbeb87abdfcfbe1bb6fe2bf3d5f126e7e69eff8edd252cecb67df3d3b7cb5e4df2c4b8cfaf39fffaf877ff97ffffd8be5d59b6f967fffcfcf1efddbc3e532debfffff9487f7ef7ffe97cff10b94e8fefd2ffeefcbe5f2e9ebd72f7f7bfffedffef6b7f4b7925e5c7d73ff4f578f5f3e7db6bebaff1f5ffee9be7ef1f3bf7c7effd59b6f88d257afbfbafcfdbddfe92f9fcc932e97675f3db8fcecbbafbf7e7c78f1d7efeb1ffffaa7172f9f3eb9ba5cbefff6f0fcd5831b5ec23967fd51ffca6fbf3f3c7bfedf377d91e69cf7f1d7cbe5fb0797f9e5f797f72e961fec6a79f3ecc9df3e7ba1f797bccc8cff2bd51fffd7e149fcafc7eb7f7f73f5e2bbe75f3db87cfee46fcbb5ef7cffede1b7af5e3e5e9f3cb87c79f5e4d593ab374f746adffcfedec5ef5e3e7efd74f9fad9e1f0e0f2f98be74f2e9757afaf5efcf7930797ffc24493ea7623feedd957af9f3eb8a4b6df393c7bfe647dfcf2c125de7bedf6fff7e2d9f3b7ef7ffbecf593abc3b36f9fbd7e7049f972f9eac1e5bd8b8bff496d240934c6da66ec1ca8d53423514f25702fa9d8f5c3562971e839f53098024b4e822b9199c643bd6a75a612ec8b836710217c7bdebbb878c88553c1edc6a9e2bb6c97f88143cc89435e634e142951d04fd65bb1245e23a51eb9a7164b92586be25813c5c169e8233d12a516f5ff5cf020c522a9dfbbb8d03f732ca9c59c5aec8963d639e5d4d7ac132da904e23422e9a4f4e525d535871c721c3d75ff7895f52b55bfc291ea23e2ae447b3a93e8d06be49c585fa7cfd95b7aec69c6a62f0a19ffae4ae9d4624b823770121db37e869a26ee29f138b550f4bf071d3b4dffba4d44ffdcf5d3df1674c2ba2c2591fec9be1ab827b18fb6e2517c4fdfa66bcaab5243a92c51dfae33c0bcf19d8155183eda9186be8a31291dacbe4a473182a4b1e654424915eb37a20e9d729a4a76fb59c12b9b7ff2460c257adf2f9ee654fe0c56fcf1f2beee0be5e2c7577fba7afcd5b327cf5f63d3ffc7977ffab7cfff4a7fbd5cbef1dbfff9fcd9eb570f2ebf7bf5e4ea3f747ffdafe7fff9eac9e5f23d3db89429a9895c2e3fd083cb2a39b5dacae5f23d9ffe891f5cf69c6aa172f9fb7b1717bf7bf5fac5cb6579f1f5d7af9ebc7e709975ebfc7078f2e052efc7f5c5e1c5d56fffe573ea0f6bc320df7920491ef3e6a7f2c8f5b31b9fa21b1ff88cbf685ffcc16871ff3a31de121bdf5d1dfef55f36dafc06fb1a9bba041a1d9b9ad208d45a246a49b0a9c5ae8f9bbaee9bba1c37f59a95dd4bd48d2b2391f272e804ce3b44aa9466e8caff4df98138954734f426979cf8d13e085fd2972f0e3f7cf3e2b90ffb5ffef0c74ea55c2e2f5f3c7baeabd89ba8f490b934a92a1b724fb2d4ae7c53674fbcd43e12872a6369ac5ba99691ead2cad8af479e7e3db66ba154977b171723d7d443ad2df5a5cf9128d43ef57a8cd0724bbc74fd77689c535d7ae734432b92da72f141c36fa0928c5416154fa1144e75a9a2bb8570b7250a85ca5287ee84ac2f6fa2f7b24eaeebf04aae49963e702969e8c0bb4e8f5b4bb4d825eb4cbb8a4fa6aa93d63dc779a4b90c7d92b3a4b2cc1138531a0b652c49563a509e69069a4a5993607db125a3d1535d3863fff696445fcdd49575babe8565e8d77a496de1aa0ba1d7b4701bf8ced0eb5ef15365e101969839c9c243e9c1194f4e888bacb4e1a1220a9cb6f0245dac4636679e3d51682a6c17ee84eba9636e59af2be6c2e012a5e6a22a8a4313251265d1a5c3b313927576ac689aa1d6ae64645dfd5297a6e4aa042eaaa9059923b1bebf15d54bbd276535957375a6fa1e46e89f95cf59aef3f1084df0ab52f43aeb00949347a853c7c853c06a92faf5794063b6417abfe277664fdb1a756e200ef754436f9cfac24d257a1f25d5a55053119cf58152671a61704eb494a1ea58794254d486c13dcd45ca4ca4fa78912a50e57391a15c3fb8a5b12859200b74e349d1fb5413e900aa3263185997bc4edd897d369d2d29b9fbc0cc791b9872b9da05bd299bb7a65baf5749b4b4a933ec8595fd5507874e75e945d43e98398da5575299a02cb653ff28f9f63da8224fb7ce0cad97340fb1aa2ea4340e9cf186540fac6bdd0ea21f94cad3515239508dc574684b3dce5443e976a11a8f420e8d5458ea1cf7ab436f6a38ccc46f22cd43644923724be51065268e2dcd4727a3f9f1dd717ff6707ed11edab86b515ee342fa3ca9de95549e4612fd37d7d4637baab64c3bc4a202ad3d8d95f45f0c8191caaaef1e816a1a5174ab488b552da75e4c7147ddb80c5b43d7416a64e5a636cdae2a814ce3b34afb1194054a4f7c502b2a70a203bea41357f9cf9cc6a1c008a8a91d5ab7ab7aa8d574793d88287d929a7d072e6a9c49ea87d6d47ca1540f45ad0e4c905a2a5138f53791f8906145c83ad56aa846893860a2084cbca1d69e32995a7945a7d1a2c0b6503ad59ee6bbb46e7ff8bc7f518dd63c27e803aad14c2336d588983fc94c2d0c5d40bd948374d842f254482d3cb595cada7b12908af20ca3e0fb41bfaf8ba7dc3f92403b327e78ea42917d3fc953651f02c3347d693f28152434dc1cca067aafe8dcb2b2310fd8a5a93d526dc24166769e509bf0d1c9746e60b23fb6cff90f6c1317557041ca487d153556cd4a93585355ce51d394d68a498afe45774fd3bfa89d27abf285ee24e51ffd2495079c9ab21726a37f0b2a774999465f53549eeaafdb5c2516650f49758d2a9a945b6960044de75974282bb6206c509512532d793d87502a7a8428b34316ebe82567e85b7dddc9ec6ea203fee7741013ec92ca2a30be39546cd9118a32ad1e0b708ca87124561358cf033acab92a3b068e2aa71acce68989e9c8a4e43483f4aae3534b04d72d9cbcefe74646b01f549cafaa03d4245312e650c10d6dc5512cb1ae41d4f7e0c453d25c752f32560c6b596d852af6dfaae7a58089e8c6f6e38eb27fb53d8a93911e27aa4e7eac19363e36a8b1bc9ebc6ce84f0e87672f5f3d595e5f3d7efeeaeb1757df3eb8fcf6f1ebab67dfff6b4ec463519e9d3496fd436f4a4d35cb5846a9494aa1df5cbe3dfbf57b35c97b1a97cbfac383cb32492faf70f772b9fa019f3a00359d6f3586d839e5cc63e95992cc516e1e446992da368892f86e07d1d31cc5ecd95e3bbf6708256f74603ddbda105477db2070f50e1f756eb38e4dc489eed9ae7c14ab2d9f8a90ae4bdf54deb06e2e3000c5b9f1f84c12672c387f632bda2e54e1deedefd088d891ca416ab7eaaf06ce2627c63aa1246660bdad3bbf98ecb093abddcafb9951796be23e43a628b7d36aa2555f82932743ca90f3b1deebd10e93aad22ab481ee423bbceae932aac4aafa3b105838ef12045ec16070e0c4b91ffb60469c63ed67e034504182c3ea0ccdd527e11cdca31d73f5a45ed748f6749250ec341eaa523c43e2956813ab7a96d6a71ef26c81bb8a2c9e1557339c2cd5cfd8085c7194a1b1aa71112452379f05e368a7477c8874d61556f2135c225827b50fd49e523b081aa60635d887096fc29fa632432052598367d7ea16012437848b1a48b20e9fac1e9294bd42818722bbab420eee6c394415e9c36d9aa29c34d4a0e82a3eff8cf9fc7879efe2e2ed697f900f4ceed805564829d39aa89057abb729e734651de535d8905cb0a1365b6906eea60729f0486d9d60385ddad8942caad628a7baaa0a87e280882d38039aeebbc158b9b6e86aa106ae53175d42562d39c388259b229dbe27d80cb70e3d1e8a1de0121f8619a9f5d1fe433f7e900483cc8a26b4b6ffda3d1d38892c3da74679de2cc260cf7e9408738b9839d10adb0976287c62902aba99d706cf12991684b5c0f068a950e81015caef4aa8000b621abf43bb11dc52fa408f33a8d0834501c3bf2bf128520d3460a0817b0b2e093f0f438f60aa1fa03d39f5472763feb9556da14ad3d5c38c942174797bb65d4581724eb482f758d7146ec91a601f16350470b2527e13d8fdca753d1b29860b6963453267224cd4a47bb7d89e6e7086ce6096649295cdb690a087d6088710a920192b8c9f66f4afba8b0503512634f9a1d28fa71d305a6c50084a1c50c74e280433174ec30328cc6adbc23eee4a5736ff044ce50981aa4f408ce93d1c76533db841d60f3066ccce7e245542cb662aeb146c7554d1c841d9a2c6a9bf36201cf56755b4f32196a1a3c4407403412f1e224c42d8e513ebaa7bc797eb67247483d30167e615225a79ce5c9b6113d2b2ba8c0e9b8cd645d6adccab8be868225aa289e8eafa07323a988c8ebb8c8e2ea4e326a4a30969d5a32ea7e326a7e3514ec35bdd533b0c18bea4a7bad8931c7485479a8792f425ca4a8f4ea6f5cefc3f89a8aee07913d52ea9c32ea9c351529ba00e9ba08e47411d5d524793d4f128a9a38beab88beaf881a2ba9a376e4c089f8915c3efaaf15dd8fc066d85675db5ad0711b08b225570bb4ee1d1c90fddc070324be3133b4f25800a499ba19a20f8193d43c1972a7c88ddce34b0fb5453d83952cd311c17da8a63605122aa39d6cca0ab387041fae26cc415b6d108a586ac473bd58419fc22cadf7a402a6a01821795e445c9c6784b24ddc5c6b370fa9b2c87042f70f9c2098017ea8e257821f4740e55574aace27c1bca5a084195aa3fa007b081788aca41e5e982bd6fa456918425ac01dbbd92f977e4a09235bb5da9328ab15daa0a4018434a41610bc860157b80bc28aa52d6683e80a20489b6793ca0644e146c3d4214041ef34d2ee377328e5c6ab38a79323c5682af91ee4b446eb0954311634bc6299986bb9ab0626a466f3195d861663668a67d66165d9a6e89a9ecf4331e8c6509d95c007d972766a1739c300895732265b89758d92bd666ee88199b0a7bc92038c7fd8530f4a34c7d56854e85656e14af38c4ea8aeb54a3e4487a8a8820acaeddaa36baeaae6a4a78eaa8d46e81187cc8bde3c00f653470b88673fd6423dcb065da1795b62d23f05af1187031cde81ab75b540bcebf5457e85378323a2219b0f27425e000d063b7ae8d4af7083f2c4d0f33aa98d0430ee68fc3471de6a90169a7528e7028283950d1159c0fc56e22d028d8173a3e0a2763bdd1e95c3fab9fd53f1e9dce0ca7692d736151215095ce0b4b4d23d49a93de1f887e0cbb6a053efd0eaf7bd7ef16c1f5d0ef16d6e770ffdec505179563b50e7d047ed45a259585558e855a8b3ec22db9aa7c8f9ffced213786cb5ff4698fe7484e7d69b0736bd181347bb3706a4b1335722ac205ad4c7d5b2da92c4d256da8d59dd34d8fd01ee7d16bc65c6569100436277d5d0bb5cdc44bc34ef3fba4df10b8b22b8205157fd7c9e7f74c6bd303dbb44a472862e8fb4b535e6eb32e4594bbbbf9e6b9208e56970269d94957a540d57635e2179e3abd4e88afcc167aaebe1216379833c9c2b3223ea05f41b464e89a94dc4243c0a650c3a9a6a6b614d0baf5acf74bc635be236d8f3758c8a08d9aca4dbef66bfaeed7d3c2eeb07eaf223ea876a5035c877aced4c36f6c7a41309be8d1c9e06e0e3cbecd8816ced015e345d75c0982d0a3e84e6c5389560b488c604cc5d1afe796ca52595747f9484f00baaa8c27e1385139817889f266e8d497da085715f1c0866b4a6d5156ec58665c8786409432a54542e803f7d4754e5065a253290b2290a14d4eb49462315f7d6f4110482750970297b532ddbcc698f72e2edecf9b826113227bba55dbd4a9f16cd803a7619b9f09feb2ee8fd6556a2965058c5b1765c7e3753686d74d3f95d394f93f2c28d77044ac3c122dadb16a7a8f0a9e5c5b3c728e6580512b22c10381297db25c0b2f7770815e37133be47f7a5fc0f88f7ffcbcfde1445034c1ea668b556378ca70cbc826701021ab704411ddb8277fda02ff7883fb7f76e4e7d43adfc476cc6e611c1f29321c60e4091df0347a3e096d4e3fd86cf085f91d813080f3ef90f73c98cddd4cf815f23c180fb4d8335bb24b868980ffc23a235868fe9a68593d96e2939116334256dbc5fcda3eece1c39cab3dc3e631779f24d9c9d662201ccca46b9e6103171fc14a820711ffcd9eba93032c3cfdef2758ab8ab029b77faed5d9af55eb0db6889cae5580211d1807355f1578ef33bca6dbdacd6861d219b6542a318736d609546b27f96204cab66da994cad1a83e7e72a9a279b16bb4b5b5b38daf55f15f29c7d502ab0dbc89fd40e30f4cf8f3695baa785cab6abe10a48f350f09280f29cf114ea367b05475ea61a9cefccfa5fa5597cafd457cd7d9ad057ec6d1cded4596d596f73c50cbd02c27199ac53334cb498666fd800ccd7d793c42522c59d333347799f493199a6c39ac01a19d3d43933d4393dfcad064cfd0947733349b6768f60fccd0849b169fbca7ab22c23cf78b1bb26f1e7efe793e5a0abb9de08a475c82b7931dc1ae78ea89e219ae11c6cd8ac736c991ba6cdae744f7b0eb1e3e61c37715cfb4d8dca9da09bbda014ddf553c3a4cdb77bbee99a7ba67533c2e0dccabfe96e269c1b26e6fd8227fee8d6ff0595ca36b955da7ff93ae1f4cd72a3f43d7d6dbae7f7da36f6f3b358ac8a5fa29ad874bf5f193527d27ac8bf5b98b75b2f57a3f51fd89ea9fd7e439ed5ae15d79be53f51d91be9135be6528057a4b9e77c8f37e23515bbf294c7d4ad43acbae29ff49d40f226a9d3725069d12f557d760f72e2ede2e33f85535981bec3729b15f5783ddbbb878b453f3180bbf7afcd5b3c7871b2a0df8af16d1eea5a7d6a758505b724b34695c2e570f2ea5a632271f2b12fe725340bdf445974a262ffb076e4e4a75f4b2f0e0346b97dffc5c69c30757293c943ef83d550a37d71bd45a48de53d630f2e49b5f33c71f8b47bcef5f27e4fbab1478ab52e8390761c42b113cc602b23bfcf4c09a13af14b95a244704b97489a394242bd74001f71849802509feba6dd640cdc2b908c155fd99325379b4bff56732f27aae81e1f7cfa608c16d26baea6a5a49903da89f5d15db2a76c60d081d58fa0c83812d5083642a4826fd3f79811276644f25224d8103c9da548906825354efc01189b7b225a758ee21458498914b808371b4644cb6b8931296d8cf012c183147c4cdb2056cece4c0b10acc8a16518590b7dfd3f5a878ba2153802c6b4c3795253a53ec88a2af6c31654b8fd1c32d59bd485df5cbd411958c24dbe7bd8b8b877a0a9e817922fdc1897dbc7ab45ffdcc429561abdd53f5fc2e4b6043224ebec52c3d2e7827135d955f91f05b908d37b7cf37f926be3233fe4e58eb26beea1ec6d5a9985c6c10f4f2d314ae73aa002e9ccaca16e42d816a4431093e9eda6caca0ccbd344ad295dc2434361497e2165dc6c1912ccd35759daf92014c8e502d84fa083ac1cda2e86a35789450b78365a935b304c2c08b78c541d5680865d17c4d2de550229b8e0b08865ab2a34eca2c0e2c6a923536a8164b7554d3d57209df3dd85e23556b3a74290539855e7ba84b6b99ce88816e37a6b9d24ce0916527ca6e0e6d264bd9861ecdf556118b55535a4cc1daa4dd46c6817ff5c37db0f424da3e57b2fc1095254e187c1e72c8fb31c053ddb7a82e0e1196ace9fe3dd5ebdd6d1b4bdd44828bdf85dc31ab0703eb6f5982f3661a9ee636d48c7c9d5a61901c39c84e3492d808857c66ec938e9d3c525d2baca116105a27d702b09a8ae7aac769bb17c95c2e45b99941382dbadd635191b1a50f9415894158ad1ec93734ebf3d59faa6aee288b23a5aa0c4bcd2c5e37e0312d952f88de531ca9458461f2ba25ed547d0c59a47ad19046bb5ab688e5204e0804b68cfd15a5046aa5423fe8d8a0058ba5caaf88ed8f005eee961b4601d314cbcff7f423361980307641da2c923455b82131dfd20656378e0526a8399b24f1216fb906c5f4924a12fbcd692f1e2b922af41f1c3ce36b062be3d0c9588e020cf8026121a17b165c433225e40caa35500a4c4865a8f8249f2a92232d7f05f5299e7bc16b337bd3f2dd2c97a058e29eca126327b20c57af8229ab551b50e06a89139ecae2f93096ee5b603f4306e6807163f96deaa2bc8269aa41fbb0669450a01252af4b60140a9eb0f887c5c7c60835e76b512abfea057791758638591f308550b2b65dd3f11a8592fa7dbdf6e248ff27b37fad0751822e7d203c465612296f5f733d86d04a3e5ed7a6d7a8ad915a126dd782fb153c2162f17aff67c64fa1e44d32a3f40b994a39275eba28d79789b85ba9ca68134335ebceaeb3d2b50cd4ec75e4110e14a5f576bc6ed063282dbb7771d15ac5e3082e361b0642fe56cba92cb3a83cd7998ee3f53b81c39be37d22c2c2c72594822c71e24590f55949872d1637a49a44af916bc7b83b425519b08825632018a94fcefd3bf04ceb46d1c96cff2ca9ec5fe30f1e9a9a34faacfeecc0754de43582953a0687b40ccea9e19a4265c6f79be5a6a3a6b0fbf77d48482fa1869fd2ad55493e30922d48c7aa9cf1828a97e9af28252aa832432d4613bd325a5a2570c1df319422692c621922c533449c3a459cb81d8f545cb3fe14ae74ae0df3c6b7d9be514181899f2c3b352a663df17bdb0215fcca4625bc1606890ae145d802c9a47362e4b2948291aa98d291caf6b8ce7efbd9d2f09d8661dab5cdb86121505785598a64a403a18a57ffd16d5e765b5f88af0b8829f8c98919946bebf9a14b555046cba08b71a15c634f2928e2a689253c5dd89b38e7946d9c8bd899f33dc17e4f1e3fe51d5b1cc1ab09cb872179201f5765db514692be0d93e7c6313c4063702eea8f311c23797686a3fd27b187b81e69a816c136e4f5d9d57a78f2f60644ed9312c47c0bb530dc0a25b13d75f5647dbde03b7cb9e00bedf238eb4ebd5d2e1e391997cbd327cfbe798af8c70df6fcf64acb84aba10a3ff5e2d7edbca4f64cdefdb1279fabf9596036ab6de8ee2e31e310f6623ff96c7eaaddad4471df103db437abe9e163d83e7f7c7bc2dd26ac437e6b063ee1729cb0bce7e19a6ff3b0935ada473c5ce563863d3ee2e1f631c36eb7a2b63fdc6f456d1f76ff18828d8f1af6ada8ed0f8f5b51db873d3f8660f363863d6f456d7bb8e58fd8922d7f04c11a7dccb0e9238441a38fd8928d3f8660e56386cd1f210c5af905d47e27ce8f737c538b84695865a79518593400de8158de5b5682c8c7d4c362af3880c259e4304e285b573df5530f0fb8155b5e2dbec3eed380c3e2ad675fbc7cbc3e7bfdc3834bbd6d5e9c593c1d71ac5b6c125568a1a04ed5ab483d9062c1154e03e594e6abb0ac72c111dfa6dddcf9a1bf30f509af0998f876572bc4ca3767e856c180a7a29533557c130e2bc645858f9791ae8f842a87ce7202b3875bca0a002df8e39a8786dc19623f5ef012d40f468be09a726f1eb34185b847769ba172052073ad79cba10768842060531eb6a9c441aa31723567681d6eeb2349dff5e77e506e48b9ebdc1064ccb1f09b2a16fa42a15fb47a3f54c779a4adc46265129ce84ba16325b8bef1934ce17b7a70d947aa866f258d0cdaca6fb11a11f53c464983b76116553b3acced1e230bf63c32855a1d762e49f52745c39691e1314fb8513dc3329c246478c4b76ff782d56452dc9231aa0790e1b83d642b03ddd2362da4bce5436c09195b4019b167b7dc11e68e0873fb53e22e59099e92114cea59e6a45bef1e9e6e70cd8e4d3a995430d39f3ccb1359161eb0453c225a8cb7444fc8409a88951fe2bfc7b19987b25e2b89bd41d676f8451a006f548076a72b3cf851875bf79c00cf5b85973f6f7e69681389b4c5a5375c398bf6185819aa14b628790b0e74b2ff8afdaa67b180d8f0df013963eea4adbe2015de6e0ec763914532688f3e1e535dd98f466535f28be3030c1fb3de2feeeaa7688a6300d7c333139cb696db83300106886a2dfcf727a95b274a6026997bb782e308e118b270cceadab1c68d04804cd86641ae3465539e2733ac4eb96adc6d3439090121e0b87a30c1ffbde50c1182fa793f3a921f344b38fef6ceb247c6a42d07c3a321b491c9c2255bd064bac6c271d455a967403bf52d7b64383a84f87df1dc941a8f01b9874a43e48002896ebbb6ff3a6d7ffc6999d1e0caa933f1c143167cc2e4cd55fa3861737656e9276cde9c65aea76c1b3b1567731477faefd49db1f73d79fc3790968cd53d9089cf768dd9c7c6f46fc991beb1fd293318bb070bf3bccdeed5b7e3588f49a99bbc18b1bccdec5ecfec392c668594edf38810794d61a8b619e2baa6b2abc4a1e77868447e8f1c2abb99eb59137bcc53f581ac967e860043377c13440d2682052d8d5003a11c5680b2b55afe0c0255d103b3b1986c773016f2a273849450728f0014024878580d322b156e660a1603392d0815954812694b3cead898e201b67a2d96fbb3b3449d5a6035d4578b095bccb4a2e095535bb71f1e006a21035269ab6ffb025955ac8ed2726cd6e28ce7a62de23e865304e9a34304338fe031cf6196af8130b0c5e5d82c5d64434741d8ba02a7a8acbb755b215e4bd4a1752f79c53e89cdb813da915644042165d9c36908ceab3488823fe09c62c5ad5d976035394c41409369203886f5d40632badb447555d12701de7042caf748839b97a00bea9d2bc25cc5923b62b71097efb415822a14577628904d7db5f02b329e8201bb2add0cba4ed7ca8f25c52cf3dd1810a46c6fd85c92eabac5cf05a803d3b49ca34491e1c61a400e2020c009168084f02a961e263558a89a8ae7a317147ba30018cfad11201091bba52e4412032bb18497b6010b89e14d30b8863675c226b43a629c5be091c4bd910c6d1dc480ff44f726f605c996ff0641bf5657cb645f2cc04a81295310bb230b2b237fcd227f641b93900562c1dbb187e5c54bc1c5f58fe530d1c35eb13056ee270824d61e4e96fa97b1086a57591af497a7f1fada12407595c563d73dd800eb34232298dd76d1f032766c2b2be8b7d147ab399f911dd4c450a32c47171926c5405518675272e8b18a743dc490c11a6db5a0710f16096d61c62d59062ad2d45ce847cad9e112722b9871d6a001d9f54875f56d8fd4552c75c3e04e106b4501602a0f3b23942abaf77b81252ba267ff23d17e11b19be5c4b08b0120b08d606926dd4fff96f260d9082530a0a8c8ad6ed9c4a8a53a98e93282e1534f24c014307931680f334caaa76fc14c729f03721e0305377775f9105d66a4792a19a609b011871f0c802c52b6640731c9ad6b13c84a400c2c5a0f1b961e0be1ee542760e018d529d2bae5ec54186a0dcab979ce890954cbe6a951764b004695b29319b130ca2defc67d0d03b3cfe6d311cfb0edf8ae0abf6a9901c80e30540b53786be4702c5cb38236da2aef8d73233240516a2fa64e2d47d8b2e8807112b29925ae3625f8c47f097f948ab27fdd142e6500e3a2ec482a3ecb8ae81372216670109fba56cf10a66630dd8190a3412e465aa8b6e5b09f238aced5d23bcd6cedd8d11ca6eed16699bd6c0e18834082355fede069ba2c3b6acf495a9b95fe109945d16c15574ffba890600c241aa59c1ca96bfc69291b3a77c79768c09a01e761b31bba844a158c07c972dda5256f1920dc2c838242a98e610588126c2b1ed841c584790654a31f7d375f1cf084f09768893102a9667076d34090a6ed11867466202de9e4d6b6953aa4061044b687b77c2d8928a28a767631a445f0a831638bae11d873562be0408094d2772bc4322da160b7446dd722782147cb4dd13366736c7b689f0adc0d03026a2b2ae3abe14f217f2bb29da1c666736fc7cfed735cc754fb7959570780273cff49e2564ee6ca4005d31ac9b724769c4145c2be9f5e19e65526e6ec3079c72eef0cb30f7688e7f58923520a3c232e01d90d1f896650f21a69ab1e81cc401dca06eb2791bcb8c49c2f1b4cd2d8ab5eec3ef291762ba9b8be81de59f5a02a38ab00ed723d06299ba31512f491493a1841f8bb183a260cc1860c15604cb4069b8a517e7f24ea2d3d9d77eddbe2897492464853252f06da2ca07a5b70a7bb1fa65ad3b50386c5cf999674b969c3726b9fe69d8d554f993c879f325bb353a6dd618b829e05316bb735379f876915007fb86135cf8598a0218859a711d3eeb0c5a3cf83980d293e9d37d16bc52b65af8b399b3d54e187685312add610449019ce663bab603b13877b25835439f135d613f712fe7f262385cba74d2bbf6dee5fb781f2f90cb354023e4a36a768738886091f49b1a8e4b98cb463a4303c77605f83888c94771efde4b2a94836d9d4a60bfa22ec81abd9ce0312b16471dc1e2b8850731b18cf4089ed916fa990ee1cba11f85236ceed3c86d306a1b4a62363fe3cf853c6087554c39fb5e24ea0c2b2b97f917bde572a8e8a4f1dec6b4eab787bb0cc3bdf6632520db51ba6bc01881a9a2a908b01ab7a1e23ad79a2594c5b6345798c75e43297f730a4ef6ad8e3704bc13d4ee6e53d1313a1d4e253c0f8dddb85536e77cf4bb7a2019a96e731d05de97ca4b2107cc203b1392f2bea51cd07547bb8b3c3dc606225b87005ae7db3d33b8ed42db0956e9dc9cac8a87009b6b5794f39da40eeb173adc078c3592927500ad5a0a4c384eb03809400d11de731b182b208a6e926fe0080e606c5d7ad1d0bced806421aa695fca0a0d4dabe9cc7442413da5a11f06103e5c0c38a5e457054e1550ca574070297c06878733e9ba704d601aed5db0d585719ec28fd3893610e00abf66a81816e38b6c1ea027b7097b449d8e6413684a3cf64f802dd55ab753ce8ee3eaea1e0bf67c30d65e4405d5071392ccce4d9141641ad5ee68a6a0f2febc5bfce63f86a3208a257b26e5c6c6e750ee6a0bca5ed7bf703059e7cb54a634378630418f87c4443ed56512830c3c8e30edd50c2e1473e13e150e17037416ce7dcadc4b78433b2b4ea003d293b35eb09e6dff889b4e0bff3301925995ccd9b8976598816aad5dac399685e1e680ea707058f2c0f3bee2095e75c283911f5accd738ab6e4cae2b18733d93e6ced39ad97c006c8615d72d97bf09cc9488ba573f03c71b41707fa3b12f4d37b5f98cdfbc23cdcfbc2deb657ef9cc718c9bdd75cbcbd70a1ee632c3f55dd50ad599c4cef368dd424f893cfc5086833719026c9fb699982453282f7b53a132ba0a1fbabd49e8a9db2c7067f01ac002be53c17b5a0eb2e0186ec6a9156a40a20b14310517e176af113a959b1324d649a0dc311410b040beb9f892cab1dbd13304c4b891deef81e1e7b3e177aa297010b599e2f1c0b563f546e8444f94483b4766266026ea905b215f69ecf49b01658fed2d056c9b29aab53b3eb71e53c8659d81a78795fd1ee0950d54edcba93ce659cc69c96e56760421b969fc4b361cf82c41fb5a98be7916fdd1c2d13fa6cd853182825c2a9ae561f52bd118632e799a408189441114ad3f35cd8f25c8261c5b5f330b1ac20556dade24138299e20a077ce8294dc9be70201a1d98a42d146a8c0f03f139b8e07524fc5f2388b953219b696f5fd3e1779c403febc821295bd90a4fad9f44ca2c3dc37dbbf796123f7cdf66f7226631cf9ed310e3ab731f6b18d716e63ccdb18cfc57a33a7531335dbadc66903b43b1f4959fb7442f6eca954fb627b5edaa71fe3d8177b6c639cdb629f8957ac6571c8a9b26e5949e4e988c0873b97610e87706a3ecc7a8aa21ece269f42e969c05da79041732b0f3c9f14aa86b499daac4ef1b8f0c5eb20cfc431d6b86cf9a76c7ba8713db394c956ac5d5f8571c97bab77b811c2993026a3ab327a0a9e380fac6d7c897c1eabcd65cf36aeae1e256fab7d2ef69a20c1a85507677564f6b2378738939dc365beb57358e8cc764e6146cf3b83199fc1fadc3a887da019e84c768f77926c76e8a9ae20556272a0f358efb2ed9db6ed9db2ad773b97bd23841e8743c93880a0c0e4f03b3cc299d81a95045d430b6a3107d61a30c7bade259e89bb0dc899d62e72dd6036d80120249ec9fe06ae282a860c34deaa3336bcf2e3c6b90619f9ab363afb3918cabf67c3b51d1ff4d86dad58b9b8d552d20d60f59f6050d10635a30fea97ca923b19145a2ed3d87aaaf0eeaa27ef91c8b06b643f15b06774006cdbbd3e8c8c0442f700de30628095e2adcc67f01613860bef85acb1591dde49dd6f75e81aab09ae0efd72f47a5b9f976a45ecd1c7147d4c8655660d7a82a769a254fa972abb3ba1ac4335ef50a6a8cc169423ce4fd186504abf369e20c1fb127caaf138c2f4de973092437e58eaf32759b57e6d44c147144f47f48b2c923b715e5372f7753dbaaf737297472bf336a6f19d0c6c1e075653df863693bc3db44fae31a54f43ad460ebad9c23d0db472e0a9e735ebfa015c9d1e0093c364187e825afa950db8c3212bc0a7c31056cec498e60ecca05150a26e260b0d203d601e2d967558ae801570c0c35303104ac49070806a12d10f4225bba5af8b7d59bc7adece102648a878d57311c77204d636b573f1c7f0a870c4e91c7b6a685c81d311da5e9466384c30a7546d6d39fa8131db33890d9509379d65faa462c84ad626a37afb8dd5baf264acef006044303c847a3e7b1098e682be3bd635039c350dad021050a897aa08794d6bbd32ad668a93ac15e042649e496b948b6d7c26f363a9413a5b7f1e548758b5116afc0d95aa58ce79031a1059b4b4443a9f446361ef2a50572207712b193d5328941cf996c7b4bb465eb56dcdb9be01c448368812ee91d190c83e0fb122869ee810d9a17fca9f89fb2132e4b7a08601686368c883cd72bc7a95038a1decc320222cd659f52933621956d48664198afb7c3d1b1f254e06f763fe74b1f632f0610af2a23aba1f422ad78af4780a83cd2c3ea2788a7749aeb7757cdef90a14ccaacb9b421b90a9b5130a15a07b86f903542dfbf8b2ccdba75cfe5a88b234fa3b88b2a59c0997df01bef0cb17871f3e19adb7761af72e2e2823a121d3e257bd2d13a86683d35c28034f043d312ece8349fe41c091e139b061663f1d6cf7d41ae7db6374dce938598d170fdbd21e8498fb9693db874afecf049b268bdc8e4407116b06d7dec4d1121f8a1a466fe254e910bb956e4e0376dbaf0e6c8d3ee50020c7a72ca91c28a3472819ae2e7963c4fde24d19c0a73a10f059dfb4d40faab8ca9bc8edc0b17e29949ff6240742ca523f14b54fdfcc432ca1bf613a48e86f0aebdb91d498d3fc73ab1f27acee8cb027c2aa3564d6e79e68697d0621ef0916a4eefd783e3907209fa48c96da215b3dbe41fd4eaf139c9645864e75584fc322d48f37b7f219fc1ae1954eb4ed360fa7d91d955df54cf65ae71284da1b16afb468def00f107b1bc470f14e9a05487ce54b9972768cdda58532c7a29fd6baaf0b8aa48be0baebb55aa1274af86cc6de5109555b92a5f71ea4b17d8ef21126c3dd32f3064425c3b3a7fa064475ca0d9f768cb5fb18ab971bd99db31aa3f04647cff0ea1b688ecc33c9946b3d6fd6a19f20ecce598d71ba7015d9b27c269dd918770520a3bcad00ce658cad79b6944c5febdecb36c63351520d27ed5a86376f46adcdb0061dfe797687c25a4b12a05dcad2d07db535514b8b3b7aff64bfea797ea442fa3546cf1dd8fc32132d5c9167d36baa4bc93d35243adcda56bc73674db5d6493555745acea102551ba8c1db95da3772883c1162fd38e3e5d7a077c925f4aa868a08fa3ce3ba010bfe3c39a4cc9a4ae8d4535f8a489aa17349732979831aa7331c75958291ce3416c1a1a197bc94397527524b63399dd799786b303c13d218a3a76acd9c5c99f473f1d880a43ed2e266a2de9377c7791b8eb833d0bd53d35ba572683274bf09a51e5a563ea81d59d9b35de3e34f366203d6edc90d8ac692dcec21ae69435dace3b661bdbb96ca3d238851c41b44b177e411ef745357832591501df4a5eb09dec1cc9bf592d960d0258d55104740bf189cfe11e2f07654dd609aa67e5faceb3d9c027543d91ec0f4afabe5f3a089087e3902046c1e0129cc71c480db44fb243298ff12591cb71cdda0f30a40460332b756022d7680cb3bc8395afd00b45c9f6e28bf24c3e923f45e61c03b02cccf7a41a866a5bddfd00020bbe5c05147d03a926c9f40d8ee1d803468e57824f7e9f5a393eb33e92bd83a107e3aa5be16efd281eefcb6d8e8eab01aa27e31c453fcb1a3210d79d3062b7a23e0ee187e4c067b34f00c72022cc8e4ada32c892b4c5be5553656dc1a7390752699ab35a19c480b10f4f969684755d1838b3278879056707b64a2bb266919c86a6bddb028fadeb21adbe0fd9cfa8bd9d428facb3875ed16486ca1603bceedf34dfe2582c15a767cac6c583b7a250dec7aab67403b935f9c35f96bad240acda9e67fa8cde13843c83ff12c1a245b9ec7e1b1cea9c42a9ccaea08a925508d53478a8fa7d9dbba1d7bf301bfdc6bfd4bd85abd58f266719a12686af8e6bc35b3f1cccc60189f0350a0cd1b29f6d4228341aba3117bf00132050143246a9550f65663fa34798f9824d1760b3ac578c3926aa89c962d4ad6aa4ed6d8ac4991a741aa0868d74a837fe9aa502ad2da5deb828cc98a35f16a601e03bc6e4e53f2c223eb8d4181adc1dfde2b51f6f67f74eccd6929b5d646c65b57146fe4c9d6bac256ca9a3756f76d23e5c6bfde1d776458b7ad95bdb79f60cd66b014b44f90598abcf820c57b89595e1a3081adf1337c23eb7e635a267144e69bf79313743f1c7b53c86cbd2fb79691d5da9978d7c7e648b786796179f8e3d81e7906efbdb27dae8695096bcbb9179f871cb2372b645fbae26d2eebb684de9595d7ad83a2153f5a3729ef9cd23d811b80165e9cdf1d216a2f39be3d604c4e77b95a607151a5243cf62aa0d32a54ef6be9ad3e9b3711457f9fbd5da8352429616f0abaf5a6f5566779af6f3d5663b6635bd0719d36f1f875714d61ddd268df41c506e66dba3f4191436faa516a9d6f623b9614985960bdad8ead84b70c7ad9eeed9d3fb18bfd8e37850b68261c9bf7f6dcf2ec0d1069eb232c9bb8d93a78e2ab16790cd3be76d2c1d6fbe93a4672f14e9d0329df0cbdb20d7bf830e72ed31c376c2b493e6645f1d66dc7811bdbd60382b11f0dca736f5b0a6583ffde5abce7d42bddf919b04e6fec3a5677d67a462ded22bb6e26cb890928de29feedbe425bd7540a5b6110a2be9f804191bbd4b8fd9341ffc11914ad4bb8fdefc6a0adab21589b9c32e88ec9c14756f446cefd846167dcdaaff3de7119b6259813ac72e44f7613a26dfce9a6c58617ff7efef4b6bdd5fb1cf6ad597a89c716c8e5c8a2d85f636b078d63eed6ebdaa01737fe8c4706b54e679eb7e03ddd6d69c917f8ccf9b3751cb100abe24470068d1b83fa6291534ce2c6a1de3b8ebca1e406595eb63671e4d623baaa7f0a1eadb35897f07ff2e83f328fd659bdf1fbdf8747b7d8c1372f9e7ff2ac9d6ca5ca7569a3ee57f0a84c5ada440fde99d35c3ac393d34b9233cc3e6ac3e6d196366768232f9d2642be92c6b9e41fb5e9d8146dcb3f6a1e0ed1cb31d299e4dfb74c69475590b437edcb5b9a6de77a2e9d45a820cb6ff48349b969e0ab5b535674b96d9602086156ed70b9ddb31ebbde71babaa0226f138a46f887ec8dfc77118b9a6986efb2b85bac1cadc8fd349f03a32131ea471c107643dc44f771f34d58958a8b1b6b4047915cba0fb7d7c6e6ed64c827eb90c230cdc44fdfc55b715b7b6eca26bd2558f7e6638f611f9e798e697321d306a2fbe47078f6f2d593e5f5d5e3e7afbe7e71f5ed83cb6f1fbfbe7af6fdbfe6443c16d50493c6b27fe066974475d6a5674a3c6bfd8d410e9446a91be44099ac3c75f5fd834b92542e97ab1ffceaf6af959a2a2fa3d424329abf5366d717d93be9a7de09d6b5ba62eb4443d60f1840b891d8030a540d0e7bf526c94004888c8ef0de58b9c15f54a2d729c69e642dae359b1f80a6a10fd9329a73a87ae35a6baf34d0329ddc274bde4ca0a4f950d0e6cbc03c45e092950ce8e67ddc3fee92e3d694cc328c96a5d06f2e6fded319ff7b47f8a4c6e56eb12a6e5c4499b684323f6eb6b173ca99c7d2b32499a37ceae99626a96dd32d896f9ceeff495bf3a7dfd9e74d2fd5bb35e5c1bcc05f33fbd8e64a757b2f8f7daed0bcfada9ee8e3f8a9a7398a20dda2d7ceefe3a65f39bd02332df98699f24e6196139484f7abeebf07dfef9dc1ac4b425e058e1b2fe06f56eb59d340dc1a870d3b5520720d1dee3045354c6f6143a8c244477d159fe86e6051c01a869dcf2c9e652075441657153d154d38fa4b446b018423071427e99f6af036fbfaa33322a58d537b58e60852f5f7246788e61ef609fd7866842e8805551c71a057a2d16ea8c5038468af8df012758bb80a7aeaa16f480466664455e37e0eb2941294539fd97c49d5a934b68c826dc6c571ba39f49f9f7247f8b8e013483b30d7aada06e69ca473db4dffbb58329fbc992d370a629d7e8ac18e08e804c01156d275a40db4881e9f48c69066ed63676c331554e8abac18865252079a94c45e6e7b76baf3c6c205ee27e6d5c00e58c76b678b1a0b4e256b6c26062321ae0a680b30151a0c024c240dab6214e59640d39b683b52c40cac278c198a87ac951b7a18697a1b4bf17695e741131e2d545d48ec86500a02c1123a08647a28275a5ba0623804141865e0c3b018dacaa67c4690b6617ef46cfa66acd3fba0b3f7069916073993c9d7a9c7605d0d5df8a9fb16f950debd19701e629461eb71db213523418ff2ea6db006ba20a814180005a9ab959cce882c34601000234459a27a16092047a0989b45e0d7e1476d36b8b1a2f4457fd673e9cc4d288468a2ec3290e884aec5608e16c1f88cc852b56433ec37efce4cca326d9d6ec43070473cb3cc90224784a9a2bb11df2f40ae1db7ed7773f75b053de7eb5ca12eb29a4c338c58b275269fdefadd1acee83dd54885ad77ed2db11aef1e274300a932d240ca2d6f96e6b0a143b4b7d540627a30c4100b26b67399c3696d51f449c46d12f13889e8b388368b787d163f75f4c16127fa296bffb0bb85529b8d97ce89a5743f73a90cad1f7fe63abe783b6c9dbc7690c8d2736a94e7273c74d5526e98ea0d87ae4fbe63a543c490dab2bd6f51f83cc32861587ae93c97b1963130d6023bc3071b6db0f1dc062b452d611e23c93a1d698d2d760600bb6a59afd9daecaaf89b2ad7550f009a6d35a82d32a02dea11757534d1546a4011d728d38136abea45fd23027162901100138825072a517ff2a1d8cd81ee6930eb747c144ec67a1ec4f39664aadb570377c271a1a075910e5e4f6c75acc088f28e466a910163c7e836cec5a4862c5093daa0d260536f1dcd6b804d5d5637a9813905933a1c4d6ab7a8ed242501a041d37253cca48e629cb519d4d12dea0840b6ae921f09edb74c1fbc738274ddc666516f0675dc0cea78625047b3a8e36e51c7a3451d37933aee26753c9ad4d16d6a808ca1f4852bcea172efe296059e774d85960568aa03ab0fbb3ab85d1d8e76b59bd56137abc36656bb551dddaa8e9b551dddac0e6656c753b33aba5d1d37bb3aee767574c33a6e86753c33c3ba629dcdb076bb3aec767538dad5665687cdac8e47b33aba5d1dcdae8e47bb3aba611d77c33a9e99615d07a9599d18c09740679bc110fe0009ba6e6675c4c993e0bf81cba5de7601efda11c51315164de5a0ad0cf09675f8aa0d1b7ca67c885dd7a4af641d943994cdd01634036b2a4445edd5e635202a2981604706510de78a15c4946a59f17af4aa2624ac5f33d2cacb3aad72429455e0e865bc25523b44ecb7beda4117720a421a65d9ca2bc22b0dab461886488b534e29b14a6a883d07642b17b87ff45fd6d56120d6ac32aba77630f8c1b6a279a92a0965bdaa4a8d62c5554f7230ec42320f1e63afa2a52ccecf4a3e396220a7160bdc29a467f0ae0683d94a4569826aa86e30b896fae390df38e44cab11840c2dde68d1009ec51c5e9e5884d0b6d51aea0a7483dcedaa86b19d1859fb34941d07a01cd502196bb4a2268edd9a096f7e5352a525488c19c0aee408da6e1521c0c935842b31d83c8c5e2c433c4eb811947322e5357283579363c5e91bf487233383e0c8c65a235be05e6d28207d82dcd1c95d55bb9a3185f6c2142547c2be026175ed504061852fdd0c38e070714df521771da54883f4a9aa902b62edc75df021d180f7644ca431a8dff1fea4a66295465fdb8c1d1aa8b548d4b03d8aae8e5e3f6c9550be9f6a186c7d4e0bae44661a0ff5aaa9a40af6c5c1135edcae57f72e2e1e72613c300312e2fdbb68fda73f701ec2aae6a17c5d01551a8e1553239ac16e1d6f507a404813e99055aa802b36510bd82e64358c96865256490d6125ec1caa5bbd2e37d7cfd90cf719bb4a811237795094d5bdf0a5ab5103390fcba8fa53aada99f5191d4c419f0e4ae56089bef045a9d4817d1587c1cfb1d7f5ba1550f53146e950c1f449f79801fac275a546054ca9aa2ac7ecb21c81cb4c3a3666734995359b5304855bddac320adb340575619b3dc38e871c40a1680df43bf25d2a720e210a2c49d18b29a3e52f4ae203321aa1fd1a248ad80f4e7bf13067a2a0b08fd8e0bf3a5427421e1cd9e48e037516544a75f7ea36f8e05057a72303bd903c09d1e44577ae90a18d5402b24b52b68a6db6cebfcd4c0db8eecc110390b711dd64357432fc5eb776732a46200c5d375514fa4928f8b3174eead1ce4a62b0fc367beb2baed354bbe661cde8918cddadd72570635cef2cfe1182280f99777d726e40d7550e6bae82dc7d0c4f166dddbdcf66c065aa08d301fb787777f7b5f17e7a23b20346bdf7adb80c7e02353b86d51e9fc730b9d13fc2302bcabf7b56a31c6609b0f619e272335755229e891ba214b5546cb8711f6fdcc71baf8df777f7bff9fdbd7308602349a10669c3dcc3e7312680a14a173b5bfdeefeab37dffcfedeff1f0000ffff5fe69651a1010100", "b1d50cc99a0abc25e4ad2cccf01cb5eb": "1f8b08000000000000ff7455df6fe3360c7eb6ff0ac24f49e0daef017a4071d71f03b2b43867dd806168158b8e8593454d92e30b8afcef03e5b897146b5e224be4c78fe427ca8afa87d821883a28323e4d5567c90598a549b653a1edb7454d5db9a36ddf34425379facf3e3b47b33f6469d290abd17b0dff6fd50d57934596265638d169daedd07d6e7f66f421786f1c698db2f458f70eb3749ea66509b7eb67501e7a8f1202418bda821f54a85bf01882323b0f5bc1a7646068d1218416d95358ab552db8228cb0456576e07a53c0376c44af03ef6612f7a8c976684256a47be162c46be00a14f71866d9fde3cbedfa39cb2f6de7d156580b8b537ac58db591f28db50c3d92115a83a33ea0076124744a4a8d8370080d3938b9b2976fa9d712b608121b655016b0699567a4d02218747b841a4d4007d4c0817af721cb222d4bdefa4e3dd7253f0b96c3ce516f7d0e18eaa228800948acb5702861f3f804575fe0dbe39f6bc618e376288c071523819012c439f940f02aac7d85856802bac5098c4b2c182286cb21b4228c6b1894d6b07edc402bf6381e181cce30395f042fbad83d4edbf5c8a93af4d4bb7a221c73f5203c0ca8f594f46f0184f674a21de1a7b23b84bac5fa074a502616939c44c7abc3452162f2af1557fa4e69f4afcc42c0d79bcdd787ab9bd56a44ccc113a830354ce8411c585eec6cb5a85182163e4cb1a2cf05f59cb9ab3056c43adca399c832c67b5b6265d9301018dca36371d4822f499136bda95969b3f98500e12d4d541375797d0d4669de48e2e724b6628dc36c5a3fda48898d925bb35fc2f4bb5d3fe7e9b8acd07b45662d3a5c42f6f2f656900d9ea315bc5770ad8ec7173f9a65799a24c7799a2609df853e50278262da07702895c33a665455ab9159f187c7599c2355b59acd27cf15edc0e1bf3dfa00716a6040e761d6281d172cfcc3bc38c3389b2dc5d3e4b18adf1194edee6f37b3accc7278a00e1f84919a0f93639a260e43ef0ce3a6c7788f274e63a3a6e38b5bc0323b9d9e32130694a9a98bc366a41fe5dc7023950743011e369ba7aa80ac0dc12ecb127f8ace6ae42998c1f59771df7f3838bb98bfe24b420f8b85a1b058001ab1d5c8752de26ce10971311e604320299266b001c1614d5d874642efe3d505ebe8e761091383f7d95d287e144a49b52fa3cda940d0914350a621d7c52867be9fcef67254efaf9ebf4bf3f7f7dceed8e2edbd2bd33b7366311bc1ce255c55abefa7462c2715f33dc8ac23d9c7c731cab3aa564f9cc4030a89ce2fa113f66f1f787cfd33febd657f5ddd911b849328af9e1c05ca96a7ce64c73c65851fd3ff020000ffff0e7737e578070000", "b928bc0be77a213dae14bb2edc434195": "1f8b08000000000000ff010000ffff0000000000000000", "bd3de4bd2aa1420e2461a4e53ca27995": "1f8b08000000000000ff9c55df8be336107ef75f311504649a536e374f752f0bb75bb614ba47b8bbb60fdb7028b6ec88589291e4bdc092ffbd8c243bcefe82de4b2ccd8cbe6fe69366d2f172cf1b018a4b9d655275c67aa01900a99527f86d4d13bec6a5cf421c4419d65e2a41325c35d2effa2d2b8d5a286ef75bee855b3456d63efe9227418dd9f675cd5bb318beb6d7110ee01b900fb31598ce3bb68ef9adf70dccae16fca9fb63e9a5d12ebad1891e59030dde7fa4dfad4d97c323ccae5ecd0025b08b87cbd773ec4c179c23ed9da9447bc60ac748f18cff772cdf8d294c938faee7287996d5bd2e416ae9690e8f999f83b0168a15a0446ccdad13342c3fdfde2c97cb5fe61175dbcbb6fa2a9540c03c03cc040ffeb4022d5b78cc00006ae5d9da4aed5b4d85b51876cc0092feec8bf0d708430743d8fda16b83c7ff16d649a38b095f3221e53c1060020578dc1cf3ec988ac107168a01e0b671588c71eca36d5c06f0c02d182b1ba9798b26b8df386fa56e3280da5890733c84672cd78d8808b11c5907d76a05e4dd3b928c708eb602de75425774807d4480fbf79b63c075f7f2e78b62c318cbd3699e4ea1af909b64dd5ac1f7617d4ca2c91a5aa129c6e598c2c52929b44f93c8f116de9ff28bb5c3ea2cd311fc54c05dd02d98acf0bdd589ba4435428217989ffb2e7db9833210bcd90425770288928de55e902220a75de039bde518f910ef374576f872d29587f018e4b9db9339101f7eb8dbbb147fa6d007588e02b4a661b7dcf396126d3c086dfa668705f54a68efa0e3ce890abc81809d4fa409a587b1c23e89ef37467b71f081e2fe72933fa7bd82cb91b61c640fe1cb6233c14d3d16913ff77a809c4339a23e6ba76925a99d225e256adeb77e94e1dbd8c4383fd99fc6ecd7dcef28495386e4bfbe84fe32e78bac431d4925558d64374629aeab13577af7d3575faa8a7df195d4103a332ca70ed3fbd1637a3f756182834b583b15132350ca1f10f038ce8ef34717ce8d53aca6a781fa892bc1be4adf0a9ac3ec0a1e86d1e4fed5640e67138de66136bdd12a716c0d9d1158b7e630de62673a7c7e7721401a7d6d0e34fc95a09512de75851a7c0edb822d26fb7c0e2afc89b0dfae5f9bd4a32e3525b75cb6b11d7a8d2c70c22a6086f893591eef636b0eecaf8efe3f74dbeb37a08fd9301dfe0b0000ffff719ea82338080000", "c2734b8fe2743d4570d32c858d08e71a": "1f8b08000000000000ffaae65250502acecc4b2fcd492c52b252502ac8292d4acc51e2aae502040000ffff3f6c01c21b000000", "c3b4ce9ea2df826ee245b5a733148c6f": "1f8b08000000000000ff5492416be3301085effa156fdbc326c5c8f72e3da4878585a52ce450f6e6893cb645648d90e4a6a1e4bf2f92b3b4b9198fdeccbcf95e2073a4913193f54ad93948ccd828e0cec978a7cac7c707b4849cf42e04bd33d98a4f7f8e232e973bb555aa6dab1836214f8c942966eb4704b13e639088b32c11cfcb3090135008ce1a2a5d74d1fe9505863c0666872132837c0fea7b64419e6c4257da7798394fd2373013f9918bf4345186cde8855303ce46ebda72e71c4e0c4ac77529ca0d2823c9cceb564d5909331d1969898c2c4566c839741482de737ce3cdb66bb078c729d5e7bdf8ef1927f2b96c566d566745fac5549d079b341eb76a58bca9d7d96cf1a150dee1f109b41eb11c74b355801dc031d6cae7f41ff5dfb72778ebaa187032ea9f94c96d38c622bca88b52ed83bac78b644ea0832c793d981ea553eafe1efbfd6fec9750c02af5ca886c649ed9f7088e4c2155f97cb570e0c916080851decf0dd262265052bb40666248c4cb68fd7b25e53857dc79e219bdd40c949113d3db19ce0ea5aaae31d098720ee9b16d4739ac81d0565af66d2f26b5755c5dfa7f5a9e17eb7aa55e27f6e8ae0a1ccacfaeb08d8b2f308cccc13a5e8d1caca7786ebe66a772a8ce4ed6391cb8c4a12c3a71a128c30a6d556afc2afcc0ef814de65ed55a6d7d4de26db7cf24dcdc7049c577197213a96b8cb5520fadfa170000ffff71ae9b187d030000", - "c62eadbe67880b98f6037f87d0f6c3c9": "1f8b08000000000000ff8c51516fd33c147df7af38daf6f07d12712af136b48742ca40686b55580b4fc8716e5dd3e4dab29dc114f2df51b2b00e0612ca436c9f73cf39f7ded7ebe5158c2bdbdd4ed52e9ffee75d279d4f516e2844ebb8ef8558df5ca339543620f338bb5caee61fdee431e8fc2777eebd5c297d50865607d3f762bb5cbf2bdeaeff8d2cbaceee7004e7714b25b2beff1dd8dab4df52e9953e8cf029d2de467cb5750dadf49e90f604f60d2cc7a4ea1a31917f86966b8a11fede547e898ea1f78a0d45312f8a5f01f927d74f2af06839d0ef5460593b7d801c4733dc1f1cb38c5de683338162145d4775a4b172603e8ef684c8d5d4f3d3d3682b273be36028e1ec3fe350db9820732925bec304f2c86e91df12572ee4ff8ff469af285b5b57c8b29854b21a99435e5ace95f7429ce286b56b1ae284e4105a1e27595a56e10e9671e283ab5a9dace31334aea273718ac5f50697cbcf8bebcdc5111ec45e5aae4601e5fda03793e387e86013b462948448c4d805d7c0b529daea7e79da7152962988417d5e14eb8ba95a88c5c7d5f2fd02cf67b3d95f2337d60435e4882869e7020d085b368f1a1ab2bfba2a1efa9f8ae8c57122034cdf481f5f7e040000ffff32d98c192e030000", + "c62eadbe67880b98f6037f87d0f6c3c9": "1f8b08000000000000ff8c524f6fd34e10bdefa718b5bfe3cfeb54dc827a0838140489234392f684d6eb89bdc49e59edae4523cbdf1dd9314da120211f6ccf7b33efcd9f7759ba8292f3f6705035c7d37bde75926df07287ce1ba6be1762b9dec15d7a7373b34a93eda725304da14d96de3f4015829dc7b175fc789225d78a4ac9ae1422dbaea13916c64164e1bfbb74b3f8f23ef64ec73f3516d6ca8dd24755e2e658f6bdd8a7d9c7e443f66f64d175e6001770e1f79843d4f7bf037b13aa3de656e9e3085f43a88c87efa6ae412b5d21840a816c03867c50750d3ea0fd1f5aaad17bb06751f9cd3381ae1495e8c522497e05e49f541f94a35172a09f942359b33e821c4733fc3f29461171641d970ebd175d87b5c73173603eb7f68248c5d4f3cbaf51564e72d382216f4d5d4014f9a082d11031c4b9a158592bc4356c4973d32005080caea57134b921e54e6008aeace3a2d5c1305d41c305cec5359c8fe1eb72bdbbbdc043b137868ab180b276a83793e3039ec104d08a2047f0880407c70d701bbc29cedbd04c411942379eda2249b2db295b88e5fd26fdbc8457b3d9ecaf961b533a35f8f090e3811d0e08192a9f3534787fbb4a9efa9f92f0f56522038c8fa82f911f010000ffff180212e637030000", "c6c122ca5a99838d992ae58ce9f7c056": "1f8b08000000000000ff7c94c1ab1b3710c6cfd55f31cf2ea4599c7d4e7b28bc4b49531a7269030998107a186bc796b0ac11d2c8db25e47f2fa3f53a79f491e38ad137bfef9bd1ae6147c1f29940187eaf870306be33e683c37882892b1c388375ccc5c7e352d00e27ae1946dac340170a9cce140522d1507a633e7f067f809e9394fe554afdce8b7bc7095e7cf962d66bf80305f75808de93d464cc5b81c07c2a10fc895a5bebb834a6420235cddd30a5e02d8ae708b501210c57a93bf813a360116f1b3fc1c1e722204eeb5452d9547160f005385154617104ab45a49fce6105071f08300e408317f0a297aad23802cb399315fdce11cf543690b09491f35036e0b848d90089edfb1ec4a1006652eecc297b14fa1a1dc58bcf1c35b6de988f5c61f4210086c237d4339e084acd346b75ddc4b5eba00866b9f7b10886d0b01603c08759dd3af696fadbc4ba6ee4f84cba0e966b6ab009a9c32b556fcc7abd86d79914f5a30a2da32ac6fc7dda4061ad7b76a1168e527e27bf264fc34cb4d46c20f278e3b218c1ceedbef551c0c7d97313bbe23d18f3c38fb0bf5e4d9c96ab2f50578ee2d0164c37ecbdb6d6c9abeaabaf7b63ccd2b9389f0a8c5e1c20583e9f95b8b56c731851acfbffda691156e1338ab718c20499f6d5873988370c7b1f314f735d9c004b2129b77ce143dbbfd626d738a7b7181ae8b25a481e5b1de862ccdb365a48eca3cc60fbcc63a1ac9bf2c989a487fbfb973fffda6ffb6dfff2e197ed76fbcf4f4f1e3f6f42c5710d03142240583df11b5841c223f5c674dd6b8ec78c52434ba1dc759d6e479ba4c30bcd384bb28f9e696a51e41aa38fc7b65fb053f77fd1bff29b313b824cea5987a7548e70d0b9f1e5b1b1235fc3e83ddf6c7d7bf87c6e44174f63fb3584a0af41133eea96c0c0b6ea6b9bc1c451566f6f980708d59eee8cf9f48e47ca34c07e5acc3cddcafc170000ffff90de672137050000", "c7014dd1ea22c08568ecfba7316fca2e": "1f8b08000000000000ff0a2d4e2dd24d4c4fcd2bb152d0e272c92c4eccc9c92fb752d0e702040000ffff4284a48f1a000000", "c8f891e9a5df1b77140ba5dad298cc3e": "1f8b08000000000000ffaae65250502a284a2d4e2d2956b252885672484a4c4acdd18708e9a6e69529c572d57201020000ffff2214070e27000000", "c9413060464ec09543343e3bee7c82e7": "1f8b08000000000000ff348d310ec2301004ebec2b4ea9628ae40594b4f006c7d8e604b9b30e1b8a287f478250ed6a34d2141fee3e47f2a1b2ca13e0a5a8551ad0f599ebadcd63d065ca3ab794fc43a7ff5a946bb41e0e787923a3c38f8c27c92c11484d02b1701d1cade88c8eb41be7f81ef67b29dfecba396cf8040000ffff2bd288128c000000", - "cb9f04739ceb356f960fa53f13efd3f3": "1f8b08000000000000ff3c8d31ae833010447b9f624af8053eca4f957e036bb0426c6bbd5b20cb778f8210ede8bd3785e637ad8cd63025faf0f4b886de9df31eff45634e15210b564e2ca431ad68eda47b777a14bea9aa62b3a239c07bd0b2e0c826a86a21606361d7dd997dd21e1752866ea4c8974ec2b06af4dad9054b33865cb4e2efca8fb7368c60912ce793b09a24a4b8ffeadf000000ffffb2b3ff10d1000000", "ce502e4fca05fc0a18b16191ce2d7ca2": "1f8b08000000000000ff4ccbb10ac2400c80e1d97b8a583af41cee01040717c14504dd255ca31cdca562d2c5907717ede2f6f3c16f062fe407418f59cbc4b0dd415a52dcc37de60c030a6cf63fbbcc4529c295446f667d626c94ce28196b7993fb1797fb5f8708165628e980a50edd695238b667a546ac34aebb183c98118feee1130000ffff2bf5ff9191000000", - "cef5ad5009e91adfaaf82d3b38c0c2c2": "1f8b08000000000000ff2a484cce4e4c4f55c84dcccce3e2cacc2dc82f2a5150b251b555c82f2829d60bc8294dcfcc0bc84e5750b5d34fce4d51e2e24a2bcd4b062bd7d054a8e6e24cce4dd173ad484d2e2d49d5d0e4aae502040000ffff0bec043151000000", "d37116f1e151db4cb9a9186baa84af28": "1f8b08000000000000ff24ccb1aec2300c05d0bd5f71d5b73c8612b1a18c4830b232a2d2baa9456223c711e2ef11b01f9d3f9cd450d4082c8b5a199d55a08256591278b71754a288d5fd516308897d6db7eda425084ff72aaf992c241d3eb41bc073c493f2a485aec9889c257580db28357ff788fef20370c5a12dcb9815ffc7f3a6efde010000fffff7ca089490000000", "dc08af8525351f73b344bfdd98b50bf3": "1f8b08000000000000ffb2c930b42b49cd2dc8492c492dd6cf4dcccc492d2ad6cf49accc2f2dd12bc8292dced0cb28c9cdb1d1cf30b4e3e2b251b555a8cc4ccd495150b5e302040000ffff448386763b000000", - "de49d3bbef3b765f3375df97e6190d32": "1f8b08000000000000ff4c8fcd6a14411485d7759fe2d810e906ad21b88b8e9b210b3722a80f505d7d7bbab0fea87bdb6408f3eed21367c8a26a730ee7fb6e75fe8f3b327c9a8842aaa5297a32dd9cb423d315e9884c770cbaaca3f525eda4cef79f76be8ccd753410ed7668a5e8214d685c1b0b6715e8c2189d307c49c9e5094f0b677817234f780aba9455e1f209b28eff2b427f5dbb6dedf1fec2b087d7f485cc6fe10700ddb8ceb38be5e397bb3d4a55b13f97d2f4bb4b8cbbafdd073a5fa41e9fd9afca70d3247031c22f214e571f81968be4c6bb496e4f580573744781abb595da82538e27bb8dfe5a8220c8f590f184e442b6dbd70f16df1425c71332f32b6171b57246c99edf020f69b234afd95f2dfb012f64c20c6e0d0ffb5be9167fbe24eff6c8216e553327b53f5ac81a73cfad0d644c11fbf81cb4bf1fc89ce94cff020000ffffea1157a3db010000", "e2475e65981b98fa738efc3c4b639c69": "1f8b08000000000000ffac8e414b03311085eff91543ee9b6dab450888aed89ba0d8f5bca4cda80be94ec8cc5661c97f9708ad16f5e6edf19837df575595f2b8c7407187835805e07b17702b1622b1bc24e4d239711bc768619a0c4561f390f0b97fcfb9fbb6560023633a5946c7fc46c99f94afc46261beb830333333f37246142c2c9512e44f8b318502d3d3a473c6617f9f40b7ab75dbdd366d73d3ac57ddd3e39d067df86aebfa180fe1fa48b0cbf3b345fdc3bdc0ae98c38e3c5efa9edd26a0ce59a998c88f5be969f8cbe53f35be68bfc97c040000ffff94a186dba3010000", - "e4ae59cf49ac7ffea86ac8585ca123cb": "1f8b08000000000000ff24c8b10ac2301000d0b9f71547a1a04bf203eae6262e7e411a2f6968930b978b0ee2bf8b747af0aaf3ab8b84a7e98c5cb599c7c2a2779709a70b40ca9545718c49973e1bcfd9469e7b086e634b2f2ada4680d08bc75b6a4ae540b8b7b9fe392289b0e007066bf1c9f866596110d22e054bdae00bbf000000ffffa4aa3fec83000000", - "ea7821493d786621a392d346e687f744": "1f8b08000000000000ff7c8f414bfb401047cf994ff123d03fc99f9a20de8a15a478f5a078120fdbdd4db2b4bb136627f650fadd25d58bd07a1c78f3decc68eccef41e363aa2104716454545d9071da66d6339b679ec6eef5acb5b3125d5446d8bfbc51a3c6a6e5e07167d36d163f1b0890ee247f1d927cdd0c1633b759dd9f3cd451e966334c9d1a791ebc635fe9dd3cde69b3e52f196fd0a40f9a7bd5c52719e572895799fd1b1e0c0b20ba9c721e870b939efbd4ce969856e4ab6b2d1e1ffaf039630d267bc7f649590fa1a5e8405472a0af13a49420a7b2a4e4b3a11cd0e8414b4aa67429875135df3e8dc8fadbaf6784d27fa0a0000ffffb89c31799d010000", "ec8652e62d2eb70a8198fe338e649eb2": "1f8b08000000000000ff94545daf9b300c7de75758aa366d0f547c947babf4657f25909446176294ba2a7753fffb44122014b4f58a07a4c43e3ef139f6be424d5c6969e04f04d02a1ddf95a00b833c4bbafe143da2e822b9f0f725af3e6a83372de20a1b340c766f192fa43c45001d1742e99a419a743db8748012fbf8aa7edb8b128d90262ed101ef1bacd1e2aab6b67f005ffde8b31f368e1435f26a232ea90f3ca3a6015832c87db03fbc4b555f68384edca9a77abf2892eea4e5a6563a2e91085b06693e02f80bc28e41315218ca6661d95585804c7a1cb184ba760dff64a074a3b48ccb06ab8fb00c83642ac03dfe9a2bc99e62212b349c146a06372da41910a764e5933d7be3d81523911582c620792fb0bab55293bd5c2235f24c0cb26328c6f5565a3d6ce433ddc5c36643e45def8e360c94f1bc38e473f2a48a73d0d0fc7cad79966d6a7e181579eaf0238a88979e74a8d6c1d7f8be77f754a2f8043240c217f5a6b596f0e00ba7cf9d3923924db20de78daa35032bc6696ed5ae2a86ef146d79696d84ddb11cbed7ac3090a8a42669a45811711776f07eb552280ebc69806b013f5ade8f63fffe9e74fd4f9b1c8e5d30784b192693cd2d4f8b416d2846cd07669edd3f0abf1dbe56387fadb083c8b620d289bb0fdb9c84a759489339e9ff8f2af2af3d2a593f6afd9a5768ae80162b6db19d82b5f49876c2b49903b33b7f86cb7a5ad769927c5b34e56f000000ffffca7f6ab658060000", "ecb1546dcc0221b6c0b61a1b5a50e58f": "1f8b08000000000000ff5c514d6edc3a0cdeeb14df5b3901fcdc7d16b9442f60ce88b2d89144839262f8f6853c13b4e8ca04cdef5751fe834c19bf7a6d886c8ca6e052fb982235acb71e0225c5ad4bf22b225510d6e54796cda88996ba42025a64d0be27b95fcbeb6ed77d71ae97a0d67aa1c6e99cffa835cebb1ad939a32aa822f77b1c5fc1a13d7924fdbaec64e68653fb0c2a1ecd0638f30c8131a574becedf64fa624426f3d8543d5a94b2d5f77118e94975636c2a655bf0f1e69c84413b19a3324bd9901952c6cefece328f700555335f94886a26b711e67bc2613a7ed0be73610fdf6d1cfe53de0cb5c10ea3026938a4c5abb8f57fbf22241abede9d33dec87ce25a67d478851ba8bb6606dd4d6b1d4e139d43836edadb8cc09c108cf92ac973e2c6c8bc40da54a18fe512d43235c46e6dc1c129cd6399658b0dcf2ed02bbf1c85a7a3d19ebf608fa2c7e29c4c2921f1287400be335446a0acbd62276bc3d8a1e6eb87739f9ff8a9485ab6d703462a8f8aa0064ae9520b52a3fb1d0000ffffd31e584a8b020000", "ecdf6a3b8924ecbd21b3179af40db25a": "1f8b08000000000000ff72c8cc2dc82f2a5150aa4bcacf2f292e294a2cd02f4e2e2ed68773f5405c256b2e844a87b4fca292c4f2d4e2fcdc54fdb4fc3c185b37ad2835551fa4393127472f37334f0fa213a135a9342d2d31275fc99a0b100000ffff04baf43578000000", @@ -100,7 +87,6 @@ var _ = func() error { "f1a742fa26b62730d7736bc2bdfac3c1": "1f8b08000000000000ffb491316bf3400c4077ff0a213038e03864358e3f3e921632b4189a76577c17fbe8f964e44b4a38eebf17676849876e9db43ca4f750a5cc055a4bd3b4c1913abdec35292d58270055bfae1f94f11042c1a39f8a2756da168df0a825c66ad5afeba45a2973a993a44a377062191e59b27bfe8d644b937e31aeb33ac61c02b5deb02bbff63ed3a07f620df93e0bf7484342c37e176309bf9e28f63b888b1c06ed7b562560f37ac0b88000e9ad2bddc048e20dd90c43284e6cd51cb49afd8bde0f1617dfa435eefdc0d95fbb86db134ac0a37770f46ef941e28ceb300754e469d9b23b1919b004fc2f1aae7c86e92cfa1fe67064752d01b7e45a6de7d0b44eaa14e23c3f030000ffff4803cb13e1010000", "f565bf21889ed8876e21065a9a977d2b": "1f8b08000000000000ff34cdc16ec2301004d0fb7ec5c8a7a4aa927ba59eda5ecb851fd898b531246bcbb14108e5df5120ec6547a3274d627b662f605b42d499284c29e6828600e34339d6a1b371ea7d1caa733cc6fefdb3e841b2a196e8c219191fafa6fb531f54885c558ba0a1342dee04647c6323ff726db6b84bcfe115acf72b8eeb587ea216d1b2bf25f982e194c6607985fd698e6a3e09585a5ae8110000ffff7d25ad33bf000000", "fb34aa975abbcb40d48be167668d4187": "1f8b08000000000000ffd2d5d5e54a492d4bcdc92fc84dcd2bb1e2525048c94ccc494d2eb152502a2eccc92c4935560209269624262516a75a295457ebe5179414eb05e5e797d4d6c6c3b80145a9699915b5b5f148a6e9410ce0e22a492da686d12063e0661614e5a794269764e6e751c164846130f301010000ffff301e0ded19010000", - "fd59f9c3d2c7ce0c05d1ff0f2c3cd0a5": "1f8b08000000000000ff6c8dd16a032110459f77be6210165c28e6079a40e86b1b02fd02575d235147744c1f4affbd74699616f27461cebd738a3657ed1d9a6401422a5419250cc207bef459194a3b4f735f161d6977cf12bb0fb9ad69926d0206f13cee910a37755ee1f9ea713c0898006ebae2f1a643d47374b8c7fb4a9ddcc7769713c0d2b3c19003cb093f61d8983a5a2b452562f1849be7fd42954f3a391c0f2fc94e7f07afa1b1cbf261f717feebbf51cf2c7f0ceba72ff80e0000ffff4170c27a17010000", "fd8cf2902df93c6d983a9dd3cf7c039e": "1f8b08000000000000ff4c8e414ac5401044d7f6298aac1290c91d74f3c185e03f41ff4927199c991e3a3d228877974016ae8a2a8ac76b1c3f791370f4a4f5204aa5a9394602862a3eefee6da0b36dc9f7fe0851cbbce9a3af2b679daf1c68229a67dcb4c88deb92c5900e301659b967c77e8dae38c4be04bd9d7fc6ae45d07893406baff13f618cb8f0e155abcbb74f103335fcd0938977ab88e143ea22369e9ee1eeecfd787f7b8685bb5baadb38dc2467c56a5af072c94e13fdd25f000000ffff16411447fa000000", }) if err != nil { @@ -108,12 +94,6 @@ var _ = func() error { } g.DefaultResolver = hgr - func() { - b := packr.New("./generate/templates", "./generate/templates") - b.SetResolver("cmd/generate.go.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "9520f324d82a6b9cf6f4fe175e5ef1f8"}) - }() - - func() { b := packr.New("buffalo:genny:assets:standard", "../standard/templates") @@ -159,19 +139,6 @@ var _ = func() error { }() - func() { - b := packr.New("buffalo:genny:plugin", "../plugin/templates") - b.SetResolver("-short-/listen.go.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "e4ae59cf49ac7ffea86ac8585ca123cb"}) - b.SetResolver("-short-/version.go.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "7a4cf344aedb69074260e6cef71f14b8"}) - b.SetResolver("README.md.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "05e19295c88c44d295648bdae4acecc9"}) - b.SetResolver("cmd/-short-.go.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "ea7821493d786621a392d346e687f744"}) - b.SetResolver("cmd/available.go.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "fd59f9c3d2c7ce0c05d1ff0f2c3cd0a5"}) - b.SetResolver("cmd/root.go.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "de49d3bbef3b765f3375df97e6190d32"}) - b.SetResolver("cmd/version.go.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "a676ca891e9d7b9f2f10d3a887fc812b"}) - b.SetResolver("main.go.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "cef5ad5009e91adfaaf82d3b38c0c2c2"}) - }() - - func() { b := packr.New("buffalo:genny:refresh", "../refresh/templates") b.SetResolver("-dot-buffalo.dev.yml.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "8ce13eeed27bfd94470fb7430910bf43"}) @@ -281,17 +248,7 @@ var _ = func() error { func() { - b := packr.New("github.com/gobuffalo/genny/genny/new", "../new/templates") - b.SetResolver("-name-/-name-.go.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "920fdc8a8285bc442cfb791bcafe45b6"}) - b.SetResolver("-name-/-name-_test.go.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "a61b972dce26544398f591b4e2f715f3"}) - b.SetResolver("-name-/options.go.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "cb9f04739ceb356f960fa53f13efd3f3"}) - b.SetResolver("-name-/options_test.go.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "793124cfbcf9ae17892b017c666be8f1"}) - b.SetResolver("-name-/templates/example.txt.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "a95877cfc2957859690620af727512eb"}) - }() - - - func() { - b := packr.New("github.com/gobuffalo/pop/genny/model/templates", "../model/templates") + b := packr.New("github.com/gobuffalo/pop/v5/genny/model/templates", "../model/templates") b.SetResolver("-path-/-name-.go.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "39754c543c1763e08ceca1b55ee96d20"}) b.SetResolver("-path-/-name-_test.go.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "6d24479674fa9f18b2c966c41ec7ff32"}) }() diff --git a/render/template_helpers.go b/render/template_helpers.go index 6d847fe13..b64c1b84d 100644 --- a/render/template_helpers.go +++ b/render/template_helpers.go @@ -6,7 +6,7 @@ import ( "path/filepath" ht "github.com/gobuffalo/helpers/tags" - "github.com/gobuffalo/tags" + "github.com/gobuffalo/tags/v3" ) type helperTag struct { diff --git a/render/template_helpers_test.go b/render/template_helpers_test.go index ac5406004..eefc88b45 100644 --- a/render/template_helpers_test.go +++ b/render/template_helpers_test.go @@ -5,7 +5,7 @@ import ( "html/template" "testing" - "github.com/gobuffalo/tags" + "github.com/gobuffalo/tags/v3" "github.com/stretchr/testify/require" )