diff options
Diffstat (limited to 'interface-definitions/include/version/interfaces-version.xml.i')
| -rw-r--r-- | interface-definitions/include/version/interfaces-version.xml.i | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/interface-definitions/include/version/interfaces-version.xml.i b/interface-definitions/include/version/interfaces-version.xml.i index 3d11ce888..25f158508 100644 --- a/interface-definitions/include/version/interfaces-version.xml.i +++ b/interface-definitions/include/version/interfaces-version.xml.i @@ -1,3 +1,7 @@ <!-- include start from include/version/interfaces-version.xml.i --> +<<<<<<< HEAD <syntaxVersion component='interfaces' version='30'></syntaxVersion> +======= +<syntaxVersion component='interfaces' version='32'></syntaxVersion> +>>>>>>> 6db8d3ded (vxlan: T5671: change port to IANA assigned default port) <!-- include end --> |