.DS_Store
<<<<<<< HEAD

# idea
code/.idea
code/build
*.jar
*.log
*.class
*.war
code/logs
code/code.iml
code/out

# gradle
code/.gradle
!code/gradle/wrapper/gradle-wrapper.jar
=======
*.txt
>>>>>>> 4770ba68eceb376456a49d8e08f5e74780bbda20