13 lines
110 B
TypeScript
13 lines
110 B
TypeScript
class C {
|
|
foo() {
|
|
<<<<<<< B
|
|
a();
|
|
}
|
|
=======
|
|
b();
|
|
}
|
|
>>>>>>> A
|
|
|
|
public bar() { }
|
|
}
|