diff options
| -rw-r--r-- | conflict-components/xml-component-version.xml.in | 4 | ||||
| -rw-r--r-- | interface-definitions/include/version/vpp-version.xml.i (renamed from conflict-components/version/vpp-version.xml.i) | 0 |
2 files changed, 0 insertions, 4 deletions
diff --git a/conflict-components/xml-component-version.xml.in b/conflict-components/xml-component-version.xml.in deleted file mode 100644 index ae137d435..000000000 --- a/conflict-components/xml-component-version.xml.in +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - #include <include/version/vpp-version.xml.i> -</interfaceDefinition> diff --git a/conflict-components/version/vpp-version.xml.i b/interface-definitions/include/version/vpp-version.xml.i index 96a69c92f..96a69c92f 100644 --- a/conflict-components/version/vpp-version.xml.i +++ b/interface-definitions/include/version/vpp-version.xml.i |