From 5048e154a0cdbae0c4d3c40fdf99ccd1d0e5497f Mon Sep 17 00:00:00 2001
From: AlexanderSehr <asehr@hotmail.de>
Date: Wed, 11 Dec 2024 23:18:56 +0100
Subject: [PATCH] Update to latest

---
 .../static/includes/interfaces/bicep/int.mi.udt.schema1.bicep | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/static/includes/interfaces/bicep/int.mi.udt.schema1.bicep b/docs/static/includes/interfaces/bicep/int.mi.udt.schema1.bicep
index 26f51f69d..091cf1ad2 100644
--- a/docs/static/includes/interfaces/bicep/int.mi.udt.schema1.bicep
+++ b/docs/static/includes/interfaces/bicep/int.mi.udt.schema1.bicep
@@ -3,11 +3,7 @@
 //   Parameters   //
 // ============== //
 
-<<<<<<<< HEAD:docs/static/includes/interfaces/bicep/int.mi.udt.schema.bicep
-import { managedIdentityAllType } from 'br/public:avm/utl/types/avm-common-types:0.4.0'
-========
 import { managedIdentityAllType } from 'br/public:avm/utl/types/avm-common-types:>version<'
->>>>>>>> main:docs/static/includes/interfaces/bicep/int.mi.udt.schema1.bicep
 @description('Optional. The managed identity definition for this resource.')
 param managedIdentities managedIdentityAllType?