26 lines
340 B
TypeScript
26 lines
340 B
TypeScript
//// [conflictMarkerTrivia2.ts]
|
|
class C {
|
|
foo() {
|
|
<<<<<<< B
|
|
a();
|
|
}
|
|
=======
|
|
b();
|
|
}
|
|
>>>>>>> A
|
|
|
|
public bar() { }
|
|
}
|
|
|
|
|
|
//// [conflictMarkerTrivia2.js]
|
|
var C = (function () {
|
|
function C() {
|
|
}
|
|
C.prototype.foo = function () {
|
|
a();
|
|
};
|
|
C.prototype.bar = function () { };
|
|
return C;
|
|
})();
|