|
|
@@ -1,3 +1,4 @@
|
|
|
+<<<<<<< HEAD
|
|
|
HELP.md
|
|
|
target/
|
|
|
!.mvn/wrapper/maven-wrapper.jar
|
|
|
@@ -31,3 +32,23 @@ build/
|
|
|
|
|
|
### VS Code ###
|
|
|
.vscode/
|
|
|
+=======
|
|
|
+# 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.
|
|
|
+>>>>>>> 4c9d54f64bc6dd1b25f7937da3f6fefac31becac
|
