Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…

…-samples into vNext-copy
IgniteUI · Aug 12, 2020 · 9e5fe65 · 9e5fe65
2 parents 28edad4 + 0fc503f
commit 9e5fe65
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "igniteui-live-editing-samples"]
 	path = igniteui-live-editing-samples
 	url = https://github.com/IgniteUI/igniteui-live-editing-samples
-    branch = vNext
+    branch = master
diff --git a/live-editing/services/DependencyResolver.ts b/live-editing/services/DependencyResolver.ts
@@ -121,7 +121,6 @@ export class DevDependencyResolver {
 
     public get devDependencies() {
         const result = {};
-
         for (let key in this._devDependencies) {
             if (key in SHARED_DEV_DEPENDENCIES) {
                     let version = this._devDependencies[key];

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "domino": "^2.1.4",
     "file-saver": "^2.0.2",
     "hammerjs": "^2.0.8",
-    "igniteui-angular": "^10.1.0",
+    "igniteui-angular": "10.1.0",
     "igniteui-angular-charts": "^9.1.2",
     "igniteui-angular-core": "^9.1.2",
     "igniteui-angular-excel": "^9.1.2",