summaryrefslogtreecommitdiff
path: root/interface-definitions/include
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-10-22 19:02:59 +0200
committerGitHub <noreply@github.com>2023-10-22 19:02:59 +0200
commit3356e26a6a58f924209b9d79ec52cb09bb4fb3ea (patch)
tree10d24e60167dfb6b5720fa32d0a97dfd6ccb47cd /interface-definitions/include
parent48da0f4fc96cd0a3a72c714b7b8fd5d57a57c15d (diff)
parent4595bca31a6f507ecb1567807f36b42bb6fe0e38 (diff)
downloadvyos-1x-3356e26a6a58f924209b9d79ec52cb09bb4fb3ea.tar.gz
vyos-1x-3356e26a6a58f924209b9d79ec52cb09bb4fb3ea.zip
Merge branch 'sagitta' into mergify/bp/sagitta/pr-2386
Diffstat (limited to 'interface-definitions/include')
-rw-r--r--interface-definitions/include/version/interfaces-version.xml.i6
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