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