Commit cba5b22d authored by Brad King's avatar Brad King
Browse files

Merge branch 'backport-FindLAPACK-typo'

Use the `-s ours` merge strategy to avoid conflicts.  Our side was
already fixed by commit 8b63265e (FindLAPACK: Unify internal variables
related to MKL, 2018-11-18) as part of other work.
parents bb735025 6f5e4a53
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment