From 23bab67bd34eb584439f6a7d748352727343a71a Mon Sep 17 00:00:00 2001
From: Charles Nurse <charlesnurse@gmail.com>
Date: Wed, 14 Apr 2021 15:59:31 -0700
Subject: [PATCH] Resolve new conflict

---
 Oqtane.Server/Oqtane.Server.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 1eb93de8..b1e6a820 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -41,6 +41,8 @@
     <EmbeddedResource Include="Scripts\Tenant.02.00.01.03.sql" />
     <EmbeddedResource Include="Scripts\Tenant.02.00.02.01.sql" />
     <EmbeddedResource Include="Scripts\Tenant.02.00.02.02.sql" />
+  </ItemGroup>
+  <ItemGroup>
     <EmbeddedResource Include="Scripts\MigrateMaster.sql" />
     <EmbeddedResource Include="Scripts\MigrateTenant.sql" />
   </ItemGroup>