Merge main into dev-rsvp-path

open-traffic-generator · Jan 22, 2024 · f84d430 · f84d430
2 parents 1dc9d1d + 7ba9c6b
commit f84d430
Show file tree

Hide file tree

Showing 8 changed files with 34,053 additions and 333 deletions.
diff --git a/gosnappi/gosnappi.go b/gosnappi/gosnappi.go
@@ -250,7 +250,11 @@ type Api interface {
 
 func (api *gosnappiApi) GetLocalVersion() Version {
 	if api.versionMeta.localVersion == nil {
+<<<<<<< HEAD
 		api.versionMeta.localVersion = NewVersion().SetApiSpecVersion("0.13.7").SetSdkVersion("0.13.6")
+=======
+		api.versionMeta.localVersion = NewVersion().SetApiSpecVersion("0.13.7").SetSdkVersion("0.13.7")
+>>>>>>> main
 	}
 
 	return api.versionMeta.localVersion