Fixed merged file

This commit is contained in:
Fabio Salvini
2017-06-27 23:07:30 +02:00
parent ded3dacd9b
commit cbde083013
3 changed files with 1 additions and 22 deletions

6
.gitignore vendored
View File

@@ -9,11 +9,7 @@ ebin
rel/example_project
.concrete/DEV_MODE
.rebar
<<<<<<< HEAD
_build/
# ---> Intellij
.idea/
*.iml
=======
>>>>>>> d5d23078c84af242a5e7b00e131919a6b76f7314
*.iml