diff options
| -rw-r--r-- | conflict-components/version/vpp-version.xml.i (renamed from interface-definitions/include/version/vpp-version.xml.i) | 0 | ||||
| -rw-r--r-- | conflict-components/xml-component-version.xml.in (renamed from interface-definitions/xml-component-version.xml.in) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/interface-definitions/include/version/vpp-version.xml.i b/conflict-components/version/vpp-version.xml.i index 96a69c92f..96a69c92f 100644 --- a/interface-definitions/include/version/vpp-version.xml.i +++ b/conflict-components/version/vpp-version.xml.i diff --git a/interface-definitions/xml-component-version.xml.in b/conflict-components/xml-component-version.xml.in index ae137d435..ae137d435 100644 --- a/interface-definitions/xml-component-version.xml.in +++ b/conflict-components/xml-component-version.xml.in |