Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

10 years ago · 394d7ed1e0
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -6,6 +6,6 @@ min-conditional-indent=1
 pad-oper
 pad-header
 unpad-paren
 delete-empty-lines
 align-pointer=type
-
+keep-one-line-blocks
 close-templates