From 94f7b179e2485d062e08a481897bb5bc487d5374 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 7 Jul 2019 13:17:37 +0200 Subject: [PATCH] Stop clang_format from breaking compiling --- .clang-format | 13 +++++++------ Source/.clang-format | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.clang-format b/.clang-format index 6c69a182f..11c499191 100644 --- a/.clang-format +++ b/.clang-format @@ -1,10 +1,11 @@ { - BasedOnStyle: webkit, - AlignTrailingComments: true, - AllowShortBlocksOnASingleLine: true, - AllowShortFunctionsOnASingleLine: None, - PointerAlignment: Right, - AlignConsecutiveAssignments: true, + BasedOnStyle: webkit, + AlignTrailingComments: true, + AllowShortBlocksOnASingleLine: true, + AllowShortFunctionsOnASingleLine: None, + PointerAlignment: Right, + AlignConsecutiveAssignments: true, TabWidth: 4, UseTab: ForIndentation, + SortIncludes: false, } diff --git a/Source/.clang-format b/Source/.clang-format index 7b78b7000..7074a4775 100644 --- a/Source/.clang-format +++ b/Source/.clang-format @@ -6,4 +6,5 @@ PointerAlignment: Right, TabWidth: 4, UseTab: ForIndentation, + SortIncludes: false, }