diff options
Diffstat (limited to 'crypto/qca/CONFLICTS')
| -rwxr-xr-x | crypto/qca/CONFLICTS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/qca/CONFLICTS b/crypto/qca/CONFLICTS deleted file mode 100755 index 45dae70c7c..0000000000 --- a/crypto/qca/CONFLICTS +++ /dev/null @@ -1 +0,0 @@ -conflicts qca2 |