From 16b063870156db78148440971ab46c649e3e6018 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 19 三月 2025 11:44:22 +0800
Subject: [PATCH] 测试定版，

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

diff --git a/.gitignore b/.gitignore
index 4154395..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