summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-01-10 18:30:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-01-10 18:30:39 +0000
commit29c44f5710d6b2f99f5d1f2582cc6098bc5b51fc (patch)
tree2947b2bcbe2a9bdf6bdf47ec889f2ef9b12895ea
parentb5b7d0a77785b8b3ab8f23ff170e92e34d932733 (diff)
parentff4e07076d08af5edb99be731938891147e2e3a4 (diff)
Merge "Use the existing .clang-format-2 for liblog"
l---------[-rw-r--r--]liblog/.clang-format10
1 files changed, 1 insertions, 9 deletions
diff --git a/liblog/.clang-format b/liblog/.clang-format
index 9db87a8f52..fd0645fdf9 100644..120000
--- a/liblog/.clang-format
+++ b/liblog/.clang-format
@@ -1,9 +1 @@
-BasedOnStyle: Google
-AllowShortFunctionsOnASingleLine: false
-
-CommentPragmas: NOLINT:.*
-DerivePointerAlignment: false
-PointerAlignment: Left
-PenaltyExcessCharacter: 32
-
-Cpp11BracedListStyle: false
+../.clang-format-2 \ No newline at end of file