diff options
| author | Alistair Delva <adelva@google.com> | 2021-02-16 21:01:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 21:01:22 +0000 |
| commit | efb2826bb8160e2d8e0fcec85133a7468484f9fd (patch) | |
| tree | 37a21c69306801ee7cdda5167a30896c8740155b /.editorconfig | |
| parent | b00a71fc312c9781fa6f404dccfb55b062b2ccac (diff) | |
| parent | faa476c0caaa598afa5a6109d17102db5fe35ec6 (diff) | |
| download | platform_external_arm-trusted-firmware-master.tar.gz platform_external_arm-trusted-firmware-master.tar.bz2 platform_external_arm-trusted-firmware-master.zip | |
Merge branch 'aosp/upstream-master' into HEAD am: faa476c0caHEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/arm-trusted-firmware/+/1589611
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a25534ceed4f8e188510641080d8b8ed49b8f62
Diffstat (limited to '.editorconfig')
| -rw-r--r-- | .editorconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.editorconfig b/.editorconfig index f523ca19d..12f786de5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,5 @@ # -# Copyright (c) 2017-2019, Arm Limited and Contributors. All rights reserved. +# Copyright (c) 2017-2020, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -38,10 +38,10 @@ indent_style = tab insert_final_newline = true # [LCS] Chapter 2: Breaking long lines and strings -# "The limit on the length of lines is 80 columns" +# "The limit on the length of lines is 100 columns" # This is a "soft" requirement for Arm-TF, and should not be the sole # reason for changes. -max_line_length = 80 +max_line_length = 100 # [LCS] Chapter 1: Indentation # "Tabs are 8 characters" |