merge fast-dev

modules/folder/organization-policies.tf

@@ -17,9 +17,10 @@
 # tfdoc:file:description Folder-level organization policies.
 
 locals {
+  _factory_data_path = pathexpand(coalesce(var.factories_config.org_policies, "-"))
   _factory_data_raw = merge([
-    for f in try(fileset(var.factories_config.org_policies, "*.yaml"), []) :
-    yamldecode(file("${var.factories_config.org_policies}/${f}"))
+    for f in try(fileset(local._factory_data_path, "*.yaml"), []) :
+    yamldecode(file("${local._factory_data_path}/${f}"))
   ]...)
   # simulate applying defaults to data coming from yaml files
   _factory_data = {

modules/folder/versions.tf

@@ -12,7 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+<<<<<<< HEAD
 # Fabric release: v35.1.0
+=======
+# Fabric release: v36.0.0
+>>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"