diff options
| author | Nikolas Klauser <nikolasklauser@berlin.de> | 2022-07-28 10:32:02 +0200 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2022-08-02 21:48:48 -0700 |
| commit | b55abcf777c97ab0fb056191ca6a6efdc9e329ce (patch) | |
| tree | ab4093e001a113c65cecd850643a2128316c9ca1 | |
| parent | 9e126d6fd2628b187ee356e66694df686817e125 (diff) | |
[libc++] Fix merge-conflict in .clang-format
(cherry picked from commit d5a3cc1d88d888e38633eb55e2afadb4cf788000)
| -rw-r--r-- | libcxx/.clang-format | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/.clang-format b/libcxx/.clang-format index 8d8eff5905af..acc6773c16de 100644 --- a/libcxx/.clang-format +++ b/libcxx/.clang-format @@ -68,7 +68,7 @@ MaxEmptyLinesToKeep: 1 NamespaceIndentation: Inner PackConstructorInitializers: NextLine -PenaltyIndentedWhitespace: 61 +PenaltyIndentedWhitespace: 2 Language: Cpp Standard: c++20 |