ignorar backups de mergetool
This commit is contained in:
parent
3f255c7070
commit
da4de71c65
1 changed files with 4 additions and 0 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -2,6 +2,10 @@
|
||||||
*.orig
|
*.orig
|
||||||
*.rej
|
*.rej
|
||||||
*~
|
*~
|
||||||
|
*_LOCAL_*
|
||||||
|
*_BASE_*
|
||||||
|
*_BACKUP_*
|
||||||
|
*_REMOTE_*
|
||||||
.bundle
|
.bundle
|
||||||
.jekyll-cache
|
.jekyll-cache
|
||||||
.sass-cache
|
.sass-cache
|
||||||
|
|
Loading…
Reference in a new issue