From d574705357af4e7714bd64a1fac571c2b42a3fa2 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 12 七月 2022 18:22:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/.gitignore b/.gitignore
index a5668fe..ce42008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@
 /LMES/obj/Release
 /LMES/obj/x86/Debug
 /MES/bin/x86/Debug
+/MES/bin/Debug
 /MES/obj/Debug
 /MES/obj/Release
 /MES/obj/x86/Debug
@@ -125,4 +126,8 @@
 /WorkM/obj/Debug
 /WorkM/obj/Release
 /WorkM/obj/x86/Debug
-/WorkM/obj/x86/Release
\ No newline at end of file
+/WorkM/obj/x86/Release
+/NETERPNoWin/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
+/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.AssemblyReference.cache
+/NETERPNoWin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+/NETERPNoWin/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs

--
Gitblit v1.9.1