summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xnet/ifupdown/CONFLICTS1
-rw-r--r--net/ifupdown/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/net/ifupdown/CONFLICTS b/net/ifupdown/CONFLICTS
new file mode 100755
index 0000000000..cc2da2c7d5
--- /dev/null
+++ b/net/ifupdown/CONFLICTS
@@ -0,0 +1 @@
+conflicts ifupdown-ng
diff --git a/net/ifupdown/HISTORY b/net/ifupdown/HISTORY
index 572f7c0d95..05547766e7 100644
--- a/net/ifupdown/HISTORY
+++ b/net/ifupdown/HISTORY
@@ -1,3 +1,6 @@
+2021-05-27 Ismael Luceno <ismael@sourcemage.org>
+ * CONFLICTS: conflict with ifupdown-ng
+
2020-08-30 Eric Sandall <sandalle@sourcemage.org>
* INSTALL: Add /sbin/ifquery to symlink pre-removal