aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2017-01-30 13:49:34 +0100
committerMarcoFalke <falke.marco@gmail.com>2017-01-30 13:50:01 +0100
commit53ab12d9318d5d195ccc77028b0e3ae66dc6e1fd (patch)
tree5cfc1e547de4c0354691e90c078d0aef4fbce031 /src
parent71fc17f6673eae2e44d226e21692283a85786c44 (diff)
parentfa5137c11d2d4accd9bfc68b3498e7e16829c3ab (diff)
downloadbitcoin-53ab12d9318d5d195ccc77028b0e3ae66dc6e1fd.tar.xz
Merge #9649: [doc] Remove unused clang format dev script
fa5137c [doc] Remove unused clang format dev script (MarcoFalke)
Diffstat (limited to 'src')
-rw-r--r--src/.clang-format2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/.clang-format b/src/.clang-format
index 129f062ef8..fc53509138 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -6,7 +6,7 @@ AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: false
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true