File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ require (
9
9
github.com/sirupsen/logrus v1.8.1
10
10
github.com/stretchr/testify v1.4.0
11
11
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
12
- golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
12
+ golang.org/x/sys v0.1.0 // indirect
13
13
gopkg.in/routeros.v2 v2.0.0-20190905230420-1bbf141cdd91
14
14
gopkg.in/yaml.v2 v2.4.0
15
15
)
Original file line number Diff line number Diff line change @@ -130,9 +130,14 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
130
130
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c /go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs =
131
131
golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 /go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs =
132
132
golang.org/x/sys v0.0.0-20210423082822-04245dca01da /go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs =
133
+ <<<<<<< dependabot/go_modules/golang.org/x/sys-0.1.0
134
+ golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U =
135
+ golang.org/x/sys v0.1.0 /go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg =
136
+ =======
133
137
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 /go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg =
134
138
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA =
135
139
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e /go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg =
140
+ >>>>>>> trunk
136
141
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 /go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo =
137
142
golang.org/x/text v0.3.0 /go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ =
138
143
golang.org/x/text v0.3.2 /go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk =
You can’t perform that action at this time.
0 commit comments