mirror of
https://github.com/hanzoai/tsgo.git
synced 2026-10-30 19:37:15 +00:00
19 lines
280 B
TypeScript
19 lines
280 B
TypeScript
//// [tests/cases/compiler/conflictMarkerTrivia1.ts] ////
|
|
|
|
//// [conflictMarkerTrivia1.ts]
|
|
class C {
|
|
<<<<<<< HEAD
|
|
v = 1;
|
|
=======
|
|
v = 2;
|
|
>>>>>>> Branch-a
|
|
}
|
|
|
|
//// [conflictMarkerTrivia1.js]
|
|
"use strict";
|
|
class C {
|
|
constructor() {
|
|
this.v = 1;
|
|
}
|
|
}
|