mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-18 09:34:34 +07:00
pull up: ignore conflicts coming from access object when it is also moved (IDEA-117671)
This commit is contained in:
+11
@@ -0,0 +1,11 @@
|
||||
import java.util.*;
|
||||
class A {
|
||||
void foo() {
|
||||
HM<String, String> hm = new HM<>();
|
||||
for (Map.Entry<String, String> stringStringEntry : hm.entrySet()) {}
|
||||
}
|
||||
|
||||
private static class HM<K, V> extends HashMap<K, V>{}
|
||||
}
|
||||
class B extends A {
|
||||
}
|
||||
Reference in New Issue
Block a user