Commit d999ccb23832be1f34653b75b5698f62a4010e89
fix: resolve commit
Showing
1 changed file
with
0 additions
and
7 deletions
.gitignore
| 1 | -<<<<<<< HEAD | |
| 2 | -======= | |
| 3 | -<<<<<<< HEAD | |
| 4 | 1 | ###################################################################### |
| 5 | 2 | # Build Tools |
| 6 | 3 | |
| ... | ... | @@ -68,7 +65,3 @@ bin-release/ |
| 68 | 65 | # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties` |
| 69 | 66 | # should NOT be excluded as they contain compiler settings and other important |
| 70 | 67 | # information for Eclipse / Flash Builder. |
| 71 | -<<<<<<< HEAD | |
| 72 | -======= | |
| 73 | ->>>>>>> origin/master | |
| 74 | ->>>>>>> 39465be (feat: first commit) | ... | ... |