From 757e9a10418043eb1a5c5e41975d3eb39db66a80 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期五, 20 六月 2025 14:27:04 +0800
Subject: [PATCH] no message

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

diff --git a/.gitignore b/.gitignore
index 08af997..6d86cfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,5 +38,11 @@
 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
+*.log

--
Gitblit v1.9.1