Skip to content

Commit eb49c87

Browse files
vladimirlazbader
authored andcommitted
[SYCL] Resolve merge conflicts in README.md and CONTRIBUTING.md (#918)
Signed-off-by: Vladimir Lazarev <[email protected]>
1 parent af5a044 commit eb49c87

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

CONTRIBUTING.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
# Contributing
32

43
## License
@@ -93,15 +92,3 @@ Merge of pull request is done only by project maintainers. There are three optio
9392
Squashing is done to shorten history and make sure that the project is buildable on any commit.
9493
- [Create a merge commit] Used for pull down PRs to avoid duplication of
9594
LLVM commits.
96-
=======
97-
# Contributing to LLVM
98-
99-
Thank you for your interest in contributing to LLVM! There are many ways to
100-
contribute, and we appreciate all contributions.
101-
102-
To get started with contributing, please take a look at the
103-
[Contributing to LLVM](https://llvm.org/docs/Contributing.html) guide. It
104-
describes how to get involved, raise issues and submit patches. Please note
105-
that at the moment the LLVM project does not use either Github pull requests
106-
or Github issues.
107-
>>>>>>> effcdc3a82f2a32829170e7f7a2ff3d7853b612d

README.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,9 @@
22

33
## Introduction
44

5-
<<<<<<< HEAD
65
Intel staging area for llvm.org contribution.
76
Home for Intel LLVM-based projects:
87
- SYCL* Compiler and Runtimes - compiler and runtime libraries for SYCL ([https://www.khronos.org/sycl/](https://www.khronos.org/sycl/)). See **sycl** branch.
9-
=======
10-
The README briefly describes how to get started with building LLVM.
11-
For more information on how to contribute to the LLVM project, please
12-
take a look at the
13-
[Contributing to LLVM](https://llvm.org/docs/Contributing.html) guide.
14-
15-
## Getting Started with the LLVM System
16-
>>>>>>> effcdc3a82f2a32829170e7f7a2ff3d7853b612d
178

189
## License
1910
See [LICENSE.txt](sycl/LICENSE.TXT) for details.

0 commit comments

Comments
 (0)