Fix scala#11307 - look up definitions in packages as well

Author: abgruszecki

scaladoc/test/dotty/tools/scaladoc/tasty/comments/MemberLookupTests.scala

@@ -104,11 +104,8 @@ class LookupTestCases[Q <: Quotes](val q: Quotes) {
 
       cls("tests.inner.B") -> "A" -> cls("tests.inner.A$"),
 
-<<<<<<< HEAD
       cls("tests.B$") -> "foo" -> cls("tests.BModule").fun("foo"),
 
-=======
->>>>>>> 1c58b4062f (Fix #11307 - look up definitions in packages as well)
       cls("tests.D") -> "foo" -> cls("tests.package$").fld("foo"),
       cls("tests.D") -> "bar" -> cls("tests.tests$package$").fld("bar"),
       cls("tests.inner.A$") -> "foo" -> cls("tests.package$").fld("foo"),