Commit 32e90f5e authored by Yann Garcia's avatar Yann Garcia
Browse files

resolved merge conflicts

parent 006901a6

examples/demo6/golang/client/client.go

+1 −0
Changes for examples/demo6/golang/client/client.go: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ package client 
import (

	"bytes"

	"context"

	"crypto/tls"

	"encoding/json"

	"encoding/xml"

	"errors"

examples/demo6/golang/go.mod

+0 −4
Changes for examples/demo6/golang/go.mod: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -17,11 +17,7 @@ require ( 
	github.com/magiconair/properties v1.8.0 // indirect

	github.com/mitchellh/mapstructure v1.1.2 // indirect

	github.com/pelletier/go-toml v1.2.0 // indirect

	github.com/spf13/afero v1.1.2 // indirect

	github.com/spf13/cast v1.3.0 // indirect

	github.com/spf13/jwalterweatherman v1.0.0 // indirect

	github.com/spf13/pflag v1.0.3 // indirect

	golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a // indirect

	golang.org/x/text v0.3.0 // indirect

	gopkg.in/yaml.v2 v2.2.2 // indirect

)

examples/demo6/golang/go.sum

+1545 −0

File changed.

Preview size limit exceeded, changes collapsed.