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

…-samples into zkolev/vnext-11-0-0
IgniteUI · Nov 13, 2020 · 8fc5803 · 8fc5803
2 parents 492f8e2 + 3dc3e35
commit 8fc5803
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 108 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/package-lock.json b/package-lock.json