Merge branch 'backport-FindLAPACK-typo'

Browse Source

Use the `-s ours` merge strategy to avoid conflicts.  Our side was
already fixed by commit 8b63265ea5 (FindLAPACK: Unify internal variables
related to MKL, 2018-11-18) as part of other work.

...

This commit is contained in:

Brad King committed 2019-01-31 10:59:53 -05:00

2 parents bb735025de 6f5e4a53bc

commit cba5b22db3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available