summaryrefslogtreecommitdiffstats
path: root/crypto/gnupg-2.1/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/gnupg-2.1/CONFLICTS')
-rwxr-xr-xcrypto/gnupg-2.1/CONFLICTS1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/gnupg-2.1/CONFLICTS b/crypto/gnupg-2.1/CONFLICTS
new file mode 100755
index 0000000000..fe59462d7d
--- /dev/null
+++ b/crypto/gnupg-2.1/CONFLICTS
@@ -0,0 +1 @@
+conflicts gnupg-exp