From 261bb58ad91f703c397c32a089d367ac4170db8c Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 06 五月 2025 22:30:50 +0800 Subject: [PATCH] 修改了状态 --- .gitignore | 50 -------------------------------------------------- 1 files changed, 0 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 24ebb01..78a752d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,52 +1,3 @@ -<<<<<<< HEAD -###################################################################### -# Build Tools - -.gradle -/build/ -!gradle/wrapper/gradle-wrapper.jar - -target/ -!.mvn/wrapper/maven-wrapper.jar - -###################################################################### -# IDE - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### JRebel ### -rebel.xml - -### NetBeans ### -nbproject/private/ -build/* -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ - -###################################################################### -# Others -*.log -*.xml.versionsBackup -*.swp - -!*/build/*.java -!*/build/*.html -!*/build/*.xml -======= .DS_Store node_modules/ dist/ @@ -70,4 +21,3 @@ package-lock.json yarn.lock ->>>>>>> 802423e8 (3.30) -- Gitblit v1.9.1