summaryrefslogtreecommitdiffstats
path: root/crypto/cryptcat/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/cryptcat/CONFLICTS')
-rwxr-xr-xcrypto/cryptcat/CONFLICTS3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/cryptcat/CONFLICTS b/crypto/cryptcat/CONFLICTS
index c1f0747cec..6ce94a887e 100755
--- a/crypto/cryptcat/CONFLICTS
+++ b/crypto/cryptcat/CONFLICTS
@@ -1,2 +1,3 @@
conflicts netcat &&
-conflicts nc
+conflicts nc &&
+conflicts nmap