Merge branch 'master' into amakeev/gradle

# Conflicts:
#	community/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java

GitOrigin-RevId: d931e798108685731bf185f7c2e3221680b8e5a2
This commit is contained in:
Anton Makeev
2019-05-17 19:11:16 +03:00
committed by intellij-monorepo-bot
parent 1e05aec13b
commit aa103fd53c
1434 changed files with 11441 additions and 7845 deletions
@@ -5,5 +5,6 @@ class Main {
}
private String getFileName(Path path) { return path.toString(); }
private String getFileName(Path path, boolean something) { return path.toString(); }
private void foo(String text, int count) {}
}