[libcxx-commits] [libcxx] d5a3cc1 - [libc++] Fix merge-conflict in .clang-format

[Nikolas Klauser via libcxx-commits]

Author: Nikolas Klauser
Date: 2022-07-28T10:32:02+02:00
New Revision: d5a3cc1d88d888e38633eb55e2afadb4cf788000

URL: https://github.com/llvm/llvm-project/commit/d5a3cc1d88d888e38633eb55e2afadb4cf788000
DIFF: https://github.com/llvm/llvm-project/commit/d5a3cc1d88d888e38633eb55e2afadb4cf788000.diff

LOG: [libc++] Fix merge-conflict in .clang-format

Added: 
    

Modified: 
    libcxx/.clang-format

Removed: 
    


################################################################################
diff  --git a/libcxx/.clang-format b/libcxx/.clang-format
index 2a83a85dab7b..b5938d53c4fd 100644
--- a/libcxx/.clang-format
+++ b/libcxx/.clang-format
@@ -67,7 +67,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PackConstructorInitializers: NextLine
 
-PenaltyIndentedWhitespace: 61
+PenaltyIndentedWhitespace: 2
 
 Language: Cpp
 Standard: c++20