From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改

---
 HDL-ON_iOS/Info.plist |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 9c3d4b3..294a70a 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleLightContent</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.502206271</string>
+	<string>1.5.502206301</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.506271</string>
+	<string>1.5.506301</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Use geographic location to provide services such as weather</string>
 	<key>NSAppleMusicUsageDescription</key>

--
Gitblit v1.8.0