Skip to content

Commit

Permalink
Merge branch 'sycl-web-to-resolve' of https://github.com/otcshare/llvm …
Browse files Browse the repository at this point in the history 
…into sycl-web-to-resolve

Conflicts:
	clang/include/clang/Basic/DiagnosticDriverKinds.td
  • Loading branch information
@robertcox-github
robertcox-github committed Sep 30, 2020
2 parents 46977c4 + cf4a898 commit 29838d4
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 29838d4

Please sign in to comment.