Skip to content

[SYCL] fix README.md after pulldown #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2019
Merged

[SYCL] fix README.md after pulldown #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
# Contributing

## License
Expand Down Expand Up @@ -93,15 +92,3 @@ Merge of pull request is done only by project maintainers. There are three optio
Squashing is done to shorten history and make sure that the project is buildable on any commit.
- [Create a merge commit] Used for pull down PRs to avoid duplication of
LLVM commits.
=======
# Contributing to LLVM

Thank you for your interest in contributing to LLVM! There are many ways to
contribute, and we appreciate all contributions.

To get started with contributing, please take a look at the
[Contributing to LLVM](https://llvm.org/docs/Contributing.html) guide. It
describes how to get involved, raise issues and submit patches. Please note
that at the moment the LLVM project does not use either Github pull requests
or Github issues.
>>>>>>> effcdc3a82f2a32829170e7f7a2ff3d7853b612d
9 changes: 0 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,9 @@

## Introduction

<<<<<<< HEAD
Intel staging area for llvm.org contribution.
Home for Intel LLVM-based projects:
- SYCL* Compiler and Runtimes - compiler and runtime libraries for SYCL ([https://www.khronos.org/sycl/](https://www.khronos.org/sycl/)). See **sycl** branch.
=======
The README briefly describes how to get started with building LLVM.
For more information on how to contribute to the LLVM project, please
take a look at the
[Contributing to LLVM](https://llvm.org/docs/Contributing.html) guide.

## Getting Started with the LLVM System
>>>>>>> effcdc3a82f2a32829170e7f7a2ff3d7853b612d

## License
See [LICENSE.txt](sycl/LICENSE.TXT) for details.
Expand Down