From ecbe16ba29cc3a7ef787357e7fa47276d9462b17 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Mon, 5 Oct 2020 21:07:10 +0800
Subject: [PATCH] Update Volo.Abp.BlazoriseUI.csproj

---
 .../src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
index 2ac8c8d84c..627e67cb36 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
+++ b/framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
@@ -4,17 +4,8 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-<<<<<<< maliming/net5
         <TargetFramework>net5.0</TargetFramework>
-        <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
-        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-        <RootNamespace />
-=======
-        <TargetFramework>netstandard2.1</TargetFramework>
         <RazorLangVersion>3.0</RazorLangVersion>
->>>>>>> dev
     </PropertyGroup>
 
     <ItemGroup>