Skip to content
Commit 7c027ee4 authored by Chris Lattner's avatar Chris Lattner
Browse files

teach clang to recover gracefully from conflict markers left in source 

files: PR5238.

llvm-svn: 91270
parent 67dfd423
Hide whitespace changes
Inline Side-by-side
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