Commit 99a5388d authored by EdwardDixon's avatar EdwardDixon Committed by GitHub
Browse files

Removed a merge conflict (!) 

The CPU version of TensorFlow wasn't building because the MKL was broken; it was broken because a merge conflict somehow made it all the way through to here.
parent a9d7985b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment