diff options
Diffstat (limited to 'interface-definitions/include/version/interfaces-version.xml.i')
| -rw-r--r-- | interface-definitions/include/version/interfaces-version.xml.i | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/interface-definitions/include/version/interfaces-version.xml.i b/interface-definitions/include/version/interfaces-version.xml.i index 25f158508..f01fe1983 100644 --- a/interface-definitions/include/version/interfaces-version.xml.i +++ b/interface-definitions/include/version/interfaces-version.xml.i @@ -1,7 +1,3 @@ <!-- 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 --> +<!-- include end -->
\ No newline at end of file |