diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-04-23 18:52:11 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-04-23 18:52:11 +0200 |
| commit | 8a37044f7f37e2d5471b443f054bc813a82dd32e (patch) | |
| tree | efb67211b2c066c50cd0fb1f765d2f5490cf3e23 | |
| parent | 9ceb3be8b21d0d952802aa08176b83d8ac21dc52 (diff) | |
| parent | f0cca903791ece22918b6f88e3d1638068f4766d (diff) | |
| download | mullvadvpn-8a37044f7f37e2d5471b443f054bc813a82dd32e.tar.xz mullvadvpn-8a37044f7f37e2d5471b443f054bc813a82dd32e.zip | |
Merge branch 'update-editorconfig-file'
| -rw-r--r-- | android/.editorconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android/.editorconfig b/android/.editorconfig index 1476e405ba..200237231f 100644 --- a/android/.editorconfig +++ b/android/.editorconfig @@ -34,10 +34,11 @@ ij_kotlin_continuation_indent_in_supertype_lists = false ij_kotlin_else_on_new_line = false ij_kotlin_enum_constants_wrap = off ij_kotlin_extends_list_wrap = normal -ij_kotlin_field_annotation_wrap = split_into_lines +ij_kotlin_field_annotation_wrap = off ij_kotlin_finally_on_new_line = false ij_kotlin_if_rparen_on_new_line = false ij_kotlin_import_nested_classes = false +ij_kotlin_imports_layout = * ij_kotlin_insert_whitespaces_in_simple_one_line_method = true ij_kotlin_keep_blank_lines_before_right_brace = 2 ij_kotlin_keep_blank_lines_in_code = 2 |