Merge pull request #948 from IgniteUI/sstoychev/resolving-master-conflicts

ChronosSF · web-flow · commit 9866d36b03d3 · 2025-10-28T14:53:10.000+02:00
Sstoychev/resolving master conflicts
diff --git a/samples/maps/geo-map/display-azure-imagery/public/index.html b/samples/maps/geo-map/display-azure-imagery/public/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>MapDisplayImageryAzureTiles</title>
+    <link href="https://static.infragistics.com/xplatform/css/samples/shared.v8.css" rel="stylesheet" />
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/samples/maps/geo-map/display-azure-imagery/src/react-app-env.d.ts b/samples/maps/geo-map/display-azure-imagery/src/react-app-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="react-scripts" />

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/// <reference types="react-scripts" />`