summaryrefslogtreecommitdiffstats
path: root/cluster/lapack/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'cluster/lapack/CONFLICTS')
-rwxr-xr-xcluster/lapack/CONFLICTS3
1 files changed, 1 insertions, 2 deletions
diff --git a/cluster/lapack/CONFLICTS b/cluster/lapack/CONFLICTS
index ab12794b00..d7c014b88c 100755
--- a/cluster/lapack/CONFLICTS
+++ b/cluster/lapack/CONFLICTS
@@ -1,2 +1 @@
-conflicts clapack &&
-conflicts atlas
+conflicts clapack