Jelajahi Sumber

解决冲突

xuzuoyun 5 tahun lalu
induk
melakukan
7643759dda
3 mengubah file dengan 33 tambahan dan 2 penghapusan
  1. 33 0
      .gitignore
  2. 0 1
      jeecg-boot-base-common/.gitignore
  3. 0 1
      jeecg-boot-module-system/.gitignore

+ 33 - 0
.gitignore

@@ -0,0 +1,33 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+**/*.iml
+out
+gen
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*

+ 0 - 1
jeecg-boot-base-common/.gitignore

@@ -1 +0,0 @@
-/target/

+ 0 - 1
jeecg-boot-module-system/.gitignore

@@ -1 +0,0 @@
-/target/