xref: /aosp_15_r20/dalvik/dx/tests/119-merge-conflict/testdata/A.java (revision 055d459012065f78d96b68be8421640240ddf631)
1 package testdata;
2 
3 public class A {
hello()4     String hello() {
5         return "hello from A";
6     }
7 }
8