From e764369bf1c317955db81a1161e9146b1bc5ceb1 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期六, 08 二月 2025 09:12:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cyronghe'

---
 .gitignore |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 08af997..bc21cc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,5 +38,10 @@
 cylsg/cylsg.Application/cylsg.Application.xml
 cylsg/cylsg.Web.Entry/application.log
 cylsg/cylsg.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
+<<<<<<< HEAD
+cylsg/ECTESTOA/bin/
+cylsg/ECTESTOA/obj/
+=======
 cylsg/ECTESTOA/obj/
 cylsg/ECTESTOA/bin/
+>>>>>>> cyronghe

--
Gitblit v1.9.1