From 35db0b2bf00a740bcca439d173dc2d0b5a2932ab Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期日, 07 四月 2024 16:48:44 +0800
Subject: [PATCH] 提交一把

---
 .gitignore |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7e867f..76361ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,6 @@
-<<<<<<< HEAD
 git*.class
 .idea/
-=======
 *.class
-
->>>>>>> 2845789016bdae401d55b7d4f857f344d80c5c50
-# Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # Package Files #
@@ -13,15 +8,13 @@
 *.war
 *.ear
 
-<<<<<<< HEAD
 target/
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
 .DS_Store
 coderd.json
-node_modules
 /dist
+platform
 
 
 # local env files
@@ -41,7 +34,4 @@
 *.njsproj
 *.sln
 *.sw?
-=======
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
->>>>>>> 2845789016bdae401d55b7d4f857f344d80c5c50

--
Gitblit v1.9.3