From 67721a765a9cca64b8c5b06d7d44fe531042b051 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 12 Feb 2025 09:21:13 +0800
Subject: [PATCH] Fix common.props

---
 common.props | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/common.props b/common.props
index 0a2b822389..b1355eb36a 100644
--- 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>