resolve conflict

claudiodangelis · Nov 11, 2023 · f46a1d3 · f46a1d3
1 parent 9ce5362
commit f46a1d3
Show file tree

Hide file tree

Showing 2 changed files with 1,890 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -3,18 +3,50 @@ module github.com/claudiodangelis/qrcp
 go 1.14
 
 require (
+<<<<<<< HEAD
 	github.com/adrg/xdg v0.4.0
+=======
+	github.com/adrg/xdg v0.3.2
+	github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect
+>>>>>>> 0659204 (chore(deps): bump several dependencies)
 	github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496
+	github.com/coreos/bbolt v1.3.2 // indirect
+	github.com/coreos/etcd v3.3.10+incompatible // indirect
+	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
+	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
 	github.com/eiannone/keyboard v0.0.0-20200508000154-caf4b762e807
+<<<<<<< HEAD
 	github.com/fatih/color v1.9.0 // indirect
 	github.com/glendc/go-external-ip v0.1.0
+=======
+	github.com/glendc/go-external-ip v0.0.0-20170425150139-139229dcdddd
+	github.com/gorilla/websocket v1.4.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
+>>>>>>> 0659204 (chore(deps): bump several dependencies)
 	github.com/jhoonb/archivex v0.0.0-20180718040744-0488e4ce1681
+	github.com/jonboulle/clockwork v0.1.0 // indirect
+	github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect
 	github.com/manifoldco/promptui v0.7.0
-	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/pelletier/go-toml v1.2.0 // indirect
+	github.com/prometheus/tsdb v0.7.1 // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086
-	github.com/spf13/cobra v1.0.0
-	github.com/spf13/viper v1.4.0
+	github.com/soheilhy/cmux v0.1.4 // indirect
+	github.com/spf13/cobra v1.8.0
+	github.com/spf13/jwalterweatherman v1.0.0 // indirect
+	github.com/spf13/viper v1.17.0
+	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
+	github.com/ugorji/go v1.1.4 // indirect
+	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
+	github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect
+	go.etcd.io/bbolt v1.3.2 // indirect
 	gopkg.in/cheggaaa/pb.v1 v1.0.28
+<<<<<<< HEAD
+=======
+	gopkg.in/resty.v1 v1.12.0 // indirect
+>>>>>>> 0659204 (chore(deps): bump several dependencies)
 	gopkg.in/yaml.v2 v2.4.0
 )