Recover after problematic merge

This commit reverts 65a557bb38f6ac03afa9aabaf02cb8d99fc68a91
                    3f5cfd958d9b6b54393c15983ac94f519c37fe61

GitOrigin-RevId: 8fb8ccbb17d0e217a83f265c185a943b0f5a7ed6
This commit is contained in:
Aleksey Pivovarov
2019-04-29 21:49:20 +03:00
committed by intellij-monorepo-bot
parent 9ff6cc29ab
commit 322db66a12
1352 changed files with 17898 additions and 13951 deletions

View File

@@ -45,8 +45,8 @@
"blank_lines_before_imports": 1,
"blank_lines_before_method_body": 0,
"blank_lines_before_package": 0,
"block_brace_style": "end_of_line",
"block_comment_at_first_column": true,
"brace_style": "end_of_line",
"call_parameters_new_line_after_left_paren": false,
"call_parameters_right_paren_on_new_line": false,
"call_parameters_wrap": "on_every_item",
@@ -94,11 +94,11 @@
"if_brace_force": "never",
"imports_layout": [
"*",
"blank_line",
"|",
"javax.**",
"java.**",
"blank_line",
"static *"
"|",
"$*"
],
"indent_case_from_switch": true,
"indent_size": 4,