diff options
| author | Bruce Dawson <brucedawson@chromium.org> | 2022-10-24 16:36:07 -0700 |
|---|---|---|
| committer | Bruce Dawson <brucedawson@chromium.org> | 2022-10-24 16:36:41 -0700 |
| commit | 721f09bda72144ed1ab7257b6aa50eecc8abac8a (patch) | |
| tree | 7abd14e442436e3d213b56837b7fe0177a6eae1d | |
| parent | 35dc1cca70fbe747d9ec2601133154275213adb5 (diff) | |
| download | ninja-721f09bda72144ed1ab7257b6aa50eecc8abac8a.tar.gz | |
Remove bad merge text from .md file
| -rw-r--r-- | CONTRIBUTING.md | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f003750..37f6ebc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,9 +14,6 @@ Generally it's the [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) with a few additions: -* Any code merged into the Ninja codebase which will be part of the main - executable must compile as C++11. You may use C++14 features in a test or an - unimportant tool if you guard your code with `#if __cplusplus >= 201402L`. * We have used `using namespace std;` a lot in the past. For new contributions, please try to avoid relying on it and instead whenever possible use `std::`. However, please do not change existing code simply to add `std::` unless your |