<<<<<<< HEAD
<<<<<<< HEAD
# Build and Release Folders
bin-debug/
bin-release/
[Oo]bj/
[Bb]in/

# Other files and folders
.settings/

# Executables
*.swf
*.air
*.ipa
*.apk

# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
# should NOT be excluded as they contain compiler settings and other important
# information for Eclipse / Flash Builder.
=======
=======
>>>>>>> 947306d2bc1a20d77b8e50fc21a6d4a15a3799b9
### Example user template template
### Example user template

# IntelliJ project files
.idea
*.iml
out
gen
target
*.class

*.log
.settings
.project
<<<<<<< HEAD
>>>>>>> seata管理分布式事务
=======
>>>>>>> 947306d2bc1a20d77b8e50fc21a6d4a15a3799b9