Skip to content

Commit

Permalink
Remove conflicting entry from .clang-format (#2018)
Browse files Browse the repository at this point in the history
  • Loading branch information
fwyzard authored Jul 26, 2023
1 parent a35e49e commit bfc35ed
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AlignConsecutiveBitFields: false
AlignConsecutiveDeclarations: false
AlignConsecutiveMacros: false
AlignEscapedNewlines: Right
AlignOperands: DontAlign
AlignOperands: Align
AlignTrailingComments: false
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
Expand Down Expand Up @@ -63,7 +63,6 @@ MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 2
NamespaceIndentation: All
AlignOperands: Align
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
Expand Down

0 comments on commit bfc35ed

Please sign in to comment.