From ee15dec5d91adbd1bdf15b26915b79751c17e481 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 09:39:17 +0800
Subject: [PATCH] 解决冲突

---
 web/Model/PageBase.cs |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/web/Model/PageBase.cs b/web/Model/PageBase.cs
index df941e0..5637e37 100644
--- a/web/Model/PageBase.cs
+++ b/web/Model/PageBase.cs
@@ -1,5 +1,4 @@
-锘�
-using Common;
+锘縰sing Common;
 using System;
 using System.Web;
 using System.Web.UI;

--
Gitblit v1.9.1