summaryrefslogtreecommitdiffstats
path: root/crypto/dropbear/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/dropbear/CONFLICTS')
-rwxr-xr-xcrypto/dropbear/CONFLICTS1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/dropbear/CONFLICTS b/crypto/dropbear/CONFLICTS
index ce6d9b6f37..cac691c6dc 100755
--- a/crypto/dropbear/CONFLICTS
+++ b/crypto/dropbear/CONFLICTS
@@ -1,3 +1,2 @@
-conflicts openssh &&
conflicts ssh &&
conflicts lsh