Skip to content

Commit 1e36a2d

Browse files
authored
Fixing messages left from merge (#135)
1 parent 407f9e3 commit 1e36a2d

4 files changed

Lines changed: 0 additions & 16 deletions

File tree

src/Providers/Maps/Google/Configuration/Shape/CircleShapeConfig.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
/// <reference path="./FilledShapeConfig.ts" />
22

33
// eslint-disable-next-line @typescript-eslint/no-unused-vars
4-
<<<<<<<< HEAD:src/Providers/Maps/Google/Configuration/Shape/CircleShapeConfig.ts
54
namespace Provider.Maps.Google.Configuration.Shape {
6-
========
7-
namespace Provider.Maps.Leaflet.Configuration.Shape {
8-
>>>>>>>> rc1.6.3:src/Providers/Maps/Leaflet/Configuration/Shape/CircleShapeConfig.ts
95
export class CircleShapeConfig extends FilledShapeConfig {
106
public center: string;
117
public radius: number;

src/Providers/Maps/Google/Configuration/Shape/RectangleShapeConfig.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
/// <reference path="./FilledShapeConfig.ts" />
22

33
// eslint-disable-next-line @typescript-eslint/no-unused-vars
4-
<<<<<<<< HEAD:src/Providers/Maps/Google/Configuration/Shape/RectangleShapeConfig.ts
54
namespace Provider.Maps.Google.Configuration.Shape {
6-
========
7-
namespace Provider.Maps.Leaflet.Configuration.Shape {
8-
>>>>>>>> rc1.6.3:src/Providers/Maps/Leaflet/Configuration/Shape/RectangleShapeConfig.ts
95
export class RectangleShapeConfig extends FilledShapeConfig {
106
public bounds: string;
117

src/Providers/Maps/Leaflet/Configuration/Shape/CircleShapeConfig.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
/// <reference path="./FilledShapeConfig.ts" />
22

33
// eslint-disable-next-line @typescript-eslint/no-unused-vars
4-
<<<<<<<< HEAD:src/Providers/Maps/Leaflet/Configuration/Shape/CircleShapeConfig.ts
54
namespace Provider.Maps.Leaflet.Configuration.Shape {
6-
========
7-
namespace Provider.Maps.Google.Configuration.Shape {
8-
>>>>>>>> rc1.6.3:src/Providers/Maps/Google/Configuration/Shape/CircleShapeConfig.ts
95
export class CircleShapeConfig extends FilledShapeConfig {
106
public center: string;
117
public radius: number;

src/Providers/Maps/Leaflet/Configuration/Shape/RectangleShapeConfig.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
/// <reference path="./FilledShapeConfig.ts" />
22

33
// eslint-disable-next-line @typescript-eslint/no-unused-vars
4-
<<<<<<<< HEAD:src/Providers/Maps/Leaflet/Configuration/Shape/RectangleShapeConfig.ts
54
namespace Provider.Maps.Leaflet.Configuration.Shape {
6-
========
7-
namespace Provider.Maps.Google.Configuration.Shape {
8-
>>>>>>>> rc1.6.3:src/Providers/Maps/Google/Configuration/Shape/RectangleShapeConfig.ts
95
export class RectangleShapeConfig extends FilledShapeConfig {
106
public bounds: string;
117

0 commit comments

Comments
 (0)