9 lines
122 B
TypeScript
9 lines
122 B
TypeScript
|
class C {
|
||
|
|
<<<<<<< HEAD
|
||
|
|
v = 1;
|
||
|
|
||||||| merged common ancestors
|
||
|
|
v = 3;
|
||
|
|
=======
|
||
|
|
v = 2;
|
||
|
|
>>>>>>> Branch-a
|
||
|
|
}
|