Fixed merged file
This commit is contained in:
6
.gitignore
vendored
6
.gitignore
vendored
@@ -9,11 +9,7 @@ ebin
|
||||
rel/example_project
|
||||
.concrete/DEV_MODE
|
||||
.rebar
|
||||
<<<<<<< HEAD
|
||||
_build/
|
||||
# ---> Intellij
|
||||
.idea/
|
||||
*.iml
|
||||
=======
|
||||
|
||||
>>>>>>> d5d23078c84af242a5e7b00e131919a6b76f7314
|
||||
*.iml
|
||||
Reference in New Issue
Block a user