Merge branch 'amakeev/gradle'

# Conflicts:
#	community/plugins/gradle/java/src/service/project/wizard/GradleModuleBuilder.java

GitOrigin-RevId: 7677c496440e29d49839174420972762c8ecc089
This commit is contained in:
Anton Makeev
2019-05-17 19:14:16 +03:00
committed by intellij-monorepo-bot
parent 939209cf81
commit a85dd1eadc
1021 changed files with 29238 additions and 4360 deletions
@@ -14,7 +14,7 @@ class Test {
class Test2 {
static void m(Integer <warning descr="Parameter 'i' is never used">i</warning>) { }
static void m(Integer i) { }
interface I1 {
void m(int x);