From 9c1af7f5ec91917b4276b25406c86386fd337fbb Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 29 十一月 2024 16:35:44 +0800
Subject: [PATCH] 修改冲突后问题
---
WinFrmUI/PBS.WinFrmUI.WE.Core/WaterWE/01-catalogue/EditCatalogueDlg.Designer.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git "a/WinFrmUI/PBS.WinFrmUI.WE.Core/\346\226\260\346\226\207\344\273\266\345\244\271/01-catalogue/EditCatalogueDlg.Designer.cs" b/WinFrmUI/PBS.WinFrmUI.WE.Core/WaterWE/01-catalogue/EditCatalogueDlg.Designer.cs
similarity index 99%
rename from "WinFrmUI/PBS.WinFrmUI.WE.Core/\346\226\260\346\226\207\344\273\266\345\244\271/01-catalogue/EditCatalogueDlg.Designer.cs"
rename to WinFrmUI/PBS.WinFrmUI.WE.Core/WaterWE/01-catalogue/EditCatalogueDlg.Designer.cs
index 0d80a15..1a72394 100644
--- "a/WinFrmUI/PBS.WinFrmUI.WE.Core/\346\226\260\346\226\207\344\273\266\345\244\271/01-catalogue/EditCatalogueDlg.Designer.cs"
+++ b/WinFrmUI/PBS.WinFrmUI.WE.Core/WaterWE/01-catalogue/EditCatalogueDlg.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace HStation.WinFrmUI.WE
+锘縩amespace PBS.WinFrmUI.WE
{
partial class EditCatalogueDlg
{
--
Gitblit v1.9.3