Fix common.props

12 months ago · 67721a765a
1 changed files with 0 additions and 5 deletions
--- a/common.props
+++ b/common.props
@ -1,13 +1,8 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-<<<<<<< auto-merge/rel-9-1/3468
-    <Version>9.1.0-rc.2</Version>
-    <LeptonXVersion>4.1.0-rc.2</LeptonXVersion>
-=======
    <Version>9.2.0-preview</Version>
    <LeptonXVersion>4.2.0-preview</LeptonXVersion>
->>>>>>> dev
    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
    <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
    <PackageProjectUrl>https://abp.io/</PackageProjectUrl>