KT-3302 Method that implements two differing interfaces are reported as "Incompatible types in superclasses"

#KT-3302 fixed

compiler/testData/loadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt

@@ -0,0 +1,16 @@
+package test
+
+public trait SubclassFromGenericAndNot : java.lang.Object {
+    
+    public trait Generic</*0*/ T> : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : T) : Unit
+    }
+    
+    public trait NonGeneric : java.lang.Object {
+        public abstract fun foo(/*0*/ p0 : jet.String) : Unit
+    }
+    
+    public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<jet.String> {
+        public abstract override /*2*/ fun foo(/*0*/ p0 : jet.String) : Unit
+    }
+}