Merge "system-clang-format: Add IncludeBlocks: Preserve" am: c4253b0ac9
am: 6030b711c0
Change-Id: I6a8aa242445e183cfab5682b459c5a1b2b83f44b
This commit is contained in:
commit
6249eee018
|
@ -4,6 +4,7 @@ AllowShortFunctionsOnASingleLine: Inline
|
|||
ColumnLimit: 100
|
||||
CommentPragmas: NOLINT:.*
|
||||
DerivePointerAlignment: false
|
||||
IncludeBlocks: Preserve
|
||||
IndentWidth: 4
|
||||
ContinuationIndentWidth: 8
|
||||
PointerAlignment: Left
|
||||
|
|
|
@ -3,6 +3,7 @@ AllowShortFunctionsOnASingleLine: Inline
|
|||
ColumnLimit: 100
|
||||
CommentPragmas: NOLINT:.*
|
||||
DerivePointerAlignment: false
|
||||
IncludeBlocks: Preserve
|
||||
IndentWidth: 2
|
||||
PointerAlignment: Left
|
||||
TabWidth: 2
|
||||
|
|
Loading…
Reference in New Issue