diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-07-29 22:07:14 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2018-07-29 22:07:17 +0200 |
| commit | 3500541316223b792805c9f816ab986c454892e7 (patch) | |
| tree | ec02048f85ca147273291316b6cfac4cd5bceccf | |
| parent | 859a37be6fe184f4bc2a092541e84e7905dfdcc0 (diff) | |
| download | vyatta-op-3500541316223b792805c9f816ab986c454892e7.tar.gz vyatta-op-3500541316223b792805c9f816ab986c454892e7.zip | |
T758: fixup - delete additional conflicting files
Fix error when building ISO:
dpkg: error processing archive /var/cache/apt/archives/vyos-1x_1.2.0-1_all.deb (--unpack):
trying to overwrite '/opt/vyatta/share/vyatta-op/templates/show/dns/dynamic/node.def', which
is also in package vyatta-op 0.14.0+vyos2+current6
| -rw-r--r-- | templates/show/dns/dynamic/node.def | 1 | ||||
| -rw-r--r-- | templates/show/dns/node.def | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/templates/show/dns/dynamic/node.def b/templates/show/dns/dynamic/node.def deleted file mode 100644 index 9a06b38..0000000 --- a/templates/show/dns/dynamic/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Show Dynamic DNS information diff --git a/templates/show/dns/node.def b/templates/show/dns/node.def deleted file mode 100644 index 45d0e4f..0000000 --- a/templates/show/dns/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Show Domain Name Server (DNS) information |