fix conflict

Azure · Jun 1, 2021 · d0c2f6e · d0c2f6e
1 parent 808938d
commit d0c2f6e
Showing 1 changed file with 0 additions and 373 deletions.
diff --git a/specification/containerservice/resource-manager/readme.azureresourceschema.md b/specification/containerservice/resource-manager/readme.azureresourceschema.md