Skip to content
Snippets Groups Projects
Commit b597c677 authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

resolve merge conflicts

parents 2069c54a 50722ba9
No related branches found
No related tags found
1 merge request!155Northbound Interface
Pipeline #72701 failed
Stage: .pre
Stage: test
Stage: build
Stage: apply
Stage: integration-test
Stage: .post
This commit is part of merge request !155. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
nucleus/device_test.go
+ 4
− 0
View file @ b597c677
......@@ -52,7 +52,11 @@ func TestNewDevice(t *testing.T) {
sbi := &OpenConfig{}
type args struct {
sbi SouthboundInterface
<<<<<<< HEAD
opts *tpb.TransportOption
=======
opts TransportOptions
>>>>>>> develop
name string
}
tests := []struct {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment