YuCheng Hu
93bd3048b7
# Conflicts: # .gitignore # pom.xml # src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java
333 lines
5.6 KiB
Plaintext
333 lines
5.6 KiB
Plaintext
<<<<<<< HEAD
|
|
=======
|
|
<<<<<<< HEAD
|
|
### Gradle ###
|
|
.gradle
|
|
build/
|
|
|
|
# Ignore Gradle GUI config
|
|
gradle-app.setting
|
|
|
|
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
|
|
!gradle-wrapper.jar
|
|
|
|
# Cache of project
|
|
.gradletasknamecache
|
|
|
|
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
|
|
# gradle/wrapper/gradle-wrapper.properties
|
|
|
|
### Gradle Patch ###
|
|
**/build/
|
|
|
|
### Intellij ###
|
|
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
|
|
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
|
|
|
# User-specific stuff
|
|
.idea/**/workspace.xml
|
|
.idea/**/tasks.xml
|
|
.idea/**/usage.statistics.xml
|
|
.idea/**/dictionaries
|
|
.idea/**/shelf
|
|
|
|
# Generated files
|
|
.idea/**/contentModel.xml
|
|
|
|
# Sensitive or high-churn files
|
|
.idea/**/dataSources/
|
|
.idea/**/dataSources.ids
|
|
.idea/**/dataSources.local.xml
|
|
.idea/**/sqlDataSources.xml
|
|
.idea/**/dynamic.xml
|
|
.idea/**/uiDesigner.xml
|
|
.idea/**/dbnavigator.xml
|
|
|
|
# Gradle
|
|
.idea/**/gradle.xml
|
|
.idea/**/libraries
|
|
|
|
# Gradle and Maven with auto-import
|
|
# When using Gradle or Maven with auto-import, you should exclude module files,
|
|
# since they will be recreated, and may cause churn. Uncomment if using
|
|
# auto-import.
|
|
# .idea/modules.xml
|
|
# .idea/*.iml
|
|
# .idea/modules
|
|
# *.iml
|
|
# *.ipr
|
|
|
|
# CMake
|
|
cmake-build-*/
|
|
|
|
# Mongo Explorer plugin
|
|
.idea/**/mongoSettings.xml
|
|
|
|
# File-based project format
|
|
*.iws
|
|
|
|
# IntelliJ
|
|
out/
|
|
|
|
# mpeltonen/sbt-idea plugin
|
|
.idea_modules/
|
|
|
|
# JIRA plugin
|
|
atlassian-ide-plugin.xml
|
|
|
|
# Cursive Clojure plugin
|
|
.idea/replstate.xml
|
|
|
|
# Crashlytics plugin (for Android Studio and IntelliJ)
|
|
com_crashlytics_export_strings.xml
|
|
crashlytics.properties
|
|
crashlytics-build.properties
|
|
fabric.properties
|
|
|
|
# Editor-based Rest Client
|
|
.idea/httpRequests
|
|
|
|
# Android studio 3.1+ serialized cache file
|
|
.idea/caches/build_file_checksums.ser
|
|
|
|
### Intellij Patch ###
|
|
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
|
|
|
|
# *.iml
|
|
# modules.xml
|
|
# .idea/misc.xml
|
|
# *.ipr
|
|
|
|
# Sonarlint plugin
|
|
.idea/sonarlint
|
|
|
|
|
|
### Intellij+iml ###
|
|
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
|
|
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
|
|
|
# User-specific stuff
|
|
.idea/**/workspace.xml
|
|
.idea/**/tasks.xml
|
|
.idea/**/usage.statistics.xml
|
|
.idea/**/dictionaries
|
|
.idea/**/shelf
|
|
|
|
# Generated files
|
|
.idea/**/contentModel.xml
|
|
|
|
# Sensitive or high-churn files
|
|
.idea/**/dataSources/
|
|
.idea/**/dataSources.ids
|
|
.idea/**/dataSources.local.xml
|
|
.idea/**/sqlDataSources.xml
|
|
.idea/**/dynamic.xml
|
|
.idea/**/uiDesigner.xml
|
|
.idea/**/dbnavigator.xml
|
|
|
|
# Gradle
|
|
.idea/**/gradle.xml
|
|
.idea/**/libraries
|
|
|
|
# Gradle and Maven with auto-import
|
|
# When using Gradle or Maven with auto-import, you should exclude module files,
|
|
# since they will be recreated, and may cause churn. Uncomment if using
|
|
# auto-import.
|
|
# .idea/modules.xml
|
|
# .idea/*.iml
|
|
# .idea/modules
|
|
# *.iml
|
|
# *.ipr
|
|
|
|
# CMake
|
|
cmake-build-*/
|
|
|
|
# Mongo Explorer plugin
|
|
.idea/**/mongoSettings.xml
|
|
|
|
# File-based project format
|
|
*.iws
|
|
|
|
# IntelliJ
|
|
out/
|
|
|
|
# mpeltonen/sbt-idea plugin
|
|
.idea_modules/
|
|
|
|
# JIRA plugin
|
|
atlassian-ide-plugin.xml
|
|
|
|
# Cursive Clojure plugin
|
|
.idea/replstate.xml
|
|
|
|
# Crashlytics plugin (for Android Studio and IntelliJ)
|
|
com_crashlytics_export_strings.xml
|
|
crashlytics.properties
|
|
crashlytics-build.properties
|
|
fabric.properties
|
|
|
|
# Editor-based Rest Client
|
|
.idea/httpRequests
|
|
|
|
# Android studio 3.1+ serialized cache file
|
|
.idea/caches/build_file_checksums.ser
|
|
|
|
### Intellij+iml Patch ###
|
|
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
|
|
|
|
*.iml
|
|
modules.xml
|
|
.idea/misc.xml
|
|
*.ipr
|
|
|
|
### Maven ###
|
|
target/
|
|
pom.xml.tag
|
|
pom.xml.releaseBackup
|
|
pom.xml.versionsBackup
|
|
pom.xml.next
|
|
release.properties
|
|
dependency-reduced-pom.xml
|
|
buildNumber.properties
|
|
.mvn/timing.properties
|
|
.mvn/wrapper/maven-wrapper.jar
|
|
.flattened-pom.xml
|
|
|
|
# CMake
|
|
cmake-build-*/
|
|
|
|
# Mongo Explorer plugin
|
|
.idea/**/mongoSettings.xml
|
|
|
|
# File-based project format
|
|
*.iws
|
|
|
|
# IntelliJ
|
|
out/
|
|
|
|
# mpeltonen/sbt-idea plugin
|
|
.idea_modules/
|
|
|
|
# JIRA plugin
|
|
atlassian-ide-plugin.xml
|
|
|
|
# Cursive Clojure plugin
|
|
.idea/replstate.xml
|
|
|
|
# Crashlytics plugin (for Android Studio and IntelliJ)
|
|
com_crashlytics_export_strings.xml
|
|
crashlytics.properties
|
|
crashlytics-build.properties
|
|
fabric.properties
|
|
|
|
# Editor-based Rest Client
|
|
.idea/httpRequests
|
|
|
|
# Android studio 3.1+ serialized cache file
|
|
.idea/caches/build_file_checksums.ser
|
|
|
|
### Intellij Patch ###
|
|
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
|
|
|
|
# *.iml
|
|
# modules.xml
|
|
# .idea/misc.xml
|
|
# *.ipr
|
|
|
|
# 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
|