SuperMap
diff --git a/‎test/tool/mock_l7.js‎
Lines changed: 3 additions & 0 deletions b/‎test/tool/mock_l7.js‎
Lines changed: 3 additions & 0 deletions
@@ -31,6 +31,7 @@ if (!Array.prototype.at) {
     configurable: true
   });
 }
+<<<<<<< HEAD
 class Event {
   constructor() {
     this.stacks = {};
@@ -47,6 +48,8 @@ class Event {
   }
 }
 const event = new Event();
+=======
+>>>>>>> 044e62b26... Add polyfill for Array.prototype.at
 class Scene {
   constructor() {
     this.layerService = {
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ if (!Array.prototype.at) {`
`31`	`31`	`configurable: true`
`32`	`32`	`});`
`33`	`33`	`}`
	`34`	`+<<<<<<< HEAD`
`34`	`35`	`class Event {`
`35`	`36`	`constructor() {`
`36`	`37`	`this.stacks = {};`
`@@ -47,6 +48,8 @@ class Event {`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`const event = new Event();`
	`51`	`+=======`
	`52`	`+>>>>>>> 044e62b26... Add polyfill for Array.prototype.at`
`50`	`53`	`class Scene {`
`51`	`54`	`constructor() {`
`52`	`55`	`this.layerService = {`