From 3500541316223b792805c9f816ab986c454892e7 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 29 Jul 2018 22:07:14 +0200 Subject: 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 --- templates/show/dns/dynamic/node.def | 1 - templates/show/dns/node.def | 1 - 2 files changed, 2 deletions(-) delete mode 100644 templates/show/dns/dynamic/node.def delete mode 100644 templates/show/dns/node.def (limited to 'templates/show') 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 -- cgit v1.2.3