From f8b607911d2fcc9c24252e3abcefca2054f96ef8 Mon Sep 17 00:00:00 2001
From: Charles Nurse <charlesnurse@gmail.com>
Date: Wed, 14 Apr 2021 15:53:07 -0700
Subject: [PATCH] Resolve conflict in project file

---
 Oqtane.Server/Oqtane.Server.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index bfe0caec..8ed5e8da 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -20,9 +20,9 @@
     <Compile Remove="wwwroot\Modules\Templates\**" />
     <Content Remove="wwwroot\Modules\Templates\**" />
     <EmbeddedResource Remove="wwwroot\Modules\Templates\**" />
-    <Compile Remove="bin\**" />
-    <EmbeddedResource Remove="bin\**" />
-    <Content Remove="bin\**" />
+    <Compile Remove="wwwroot\Themes\Templates\**" />
+    <Content Remove="wwwroot\Themes\Templates\**" />
+    <EmbeddedResource Remove="wwwroot\Themes\Templates\**" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Scripts\Master.00.00.00.00.sql" />