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

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

diff --git a/.gitignore b/.gitignore
index 016b75c..bc21cc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,11 @@
 cylsg/EzJob/obj/
 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