From 1dc3c8bbc6ad0afdb8dfdfa4c0b9334d3095cf10 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 04 四月 2023 23:31:15 +0800
Subject: [PATCH] 侧边栏

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

diff --git a/.gitignore b/.gitignore
index 24ebb01..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,73 +0,0 @@
-<<<<<<< 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/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-**/*.log
-
-tests/**/coverage/
-tests/e2e/reports
-selenium-debug.log
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.local
-
-package-lock.json
-yarn.lock
->>>>>>> 802423e8 (3.30)

--
Gitblit v1.9.1