添加忽略文件的内容

2021-04-15 11:05:54 -04:00
parent b21fbc57a9
commit 0a95135161
31 changed files with 306 additions and 724 deletions
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
 ### Gradle ###
 .gradle
 build/
@@ -236,97 +233,3 @@ fabric.properties

 # Sonarlint plugin
 .idea/sonarlint
-=======
->>>>>>> RB
-# Binaries
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.war
-*.ear
-*.sar
-*.class
-
-# Maven 
-target/
-
-# eclipse project file
-.settings/
-.classpath
-.project
-
-
-# IntelliJ project files 
-*.iml
-*.iws
-*.ipr
-.idea/
-
-
-
-# NetBeans specific
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-nbactions.xml
-nb-configuration.xml
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# =========================
-# Operating System Files
-# =========================
-
-# OSX
-# =========================
-
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-<<<<<<< HEAD
-=======
->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
->>>>>>> RB