Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/block-editor-list-validation

# Conflicts: # src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
2020-07-17 13:51:18 +10:00
parent b57545a9b0 f759ab4d36
commit ffe41fcb68
1 changed files with 0 additions and 1 deletions
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -64,7 +64,6 @@
        });

        vm.$onInit = function() {
-
            if (!vm.umbVariantContent) {
                // not found, then fallback to searching the scope chain, this may be needed when DOM inheritance isn't maintained but scope
                // inheritance is (i.e.infinite editing)