From fba02ea2d64683a5b830f87637e72eeb848dcaf6 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Mon, 16 Aug 2021 14:21:37 +0200
Subject: [PATCH] Fix merge conflict

---
 src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
index fe7724f41d..8fca7bed48 100644
--- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
@@ -230,10 +230,9 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade
             // - 8.15 RC    - Current state: {4695D0C9-0729-4976-985B-048D503665D8}
             // - 8.15 Final - Current state: {5C424554-A32D-4852-8ED1-A13508187901}
             // - 9.0 RC1    - Current state: {5060F3D2-88BE-4D30-8755-CF51F28EAD12}           
-             To<UpdateCmsPropertyGroupIdSeed>("{622E5172-42E1-4662-AD80-9504AF5A4E53}");
+            To<UpdateCmsPropertyGroupIdSeed>("{622E5172-42E1-4662-AD80-9504AF5A4E53}");
             To<ExternalLoginTableIndexesFixup>("{10F7BB61-C550-426B-830B-7F954F689CDF}");
             To<DictionaryTablesIndexes>("{12DCDE7F-9AB7-4617-804F-AB66BF360980}");
-
         }
     }
 }