16 lines
159 B
TypeScript
16 lines
159 B
TypeScript
|
class C {
|
||
|
foo() {
|
||
|
<<<<<<< B
|
||
|
a();
|
||
|
}
|
||
|
||||||| merged common ancestors
|
||
|
c();
|
||
|
}
|
||
|
=======
|
||
|
b();
|
||
|
}
|
||
|
>>>>>>> A
|
||
|
|
||
|
public bar() { }
|
||
|
}
|