From b55abcf777c97ab0fb056191ca6a6efdc9e329ce Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser@berlin.de>
Date: Thu, 28 Jul 2022 10:32:02 +0200
Subject: [PATCH] [libc++] Fix merge-conflict in .clang-format

(cherry picked from commit d5a3cc1d88d888e38633eb55e2afadb4cf788000)
---
 libcxx/.clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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