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
@@ -0,0 +1,14 @@
import java.util.List;
import java.util.Set;
abstract class Overloadsss {
abstract <T> List<T> foo(List<T> l);
abstract <T> Set<T> foo(Set<T> s);
abstract <K> List<K> bar1(List<K> l);
abstract <K> Set<K> bar1(Set<K> s);
{
List<String> l1 = foo(<caret>bar1(null));
}
}