diff options
| author | Marian Oancea <contact@siteshop.ro> | 2014-11-11 18:11:06 +0800 |
|---|---|---|
| committer | Marian Oancea <contact@siteshop.ro> | 2014-11-11 18:11:06 +0800 |
| commit | 7af9cc70d01b3549de1b90afce591376ec554737 (patch) | |
| tree | 469ed412825f3426148baaf186436f44c6a851f5 /.gitignore | |
| parent | 720365859cfc56a6b59f6824f61138ed7ea8a782 (diff) | |
| parent | 4b876168f4db1f339d8d1a222a3ccb9a3f756957 (diff) | |
| download | dexon-7af9cc70d01b3549de1b90afce591376ec554737.tar dexon-7af9cc70d01b3549de1b90afce591376ec554737.tar.gz dexon-7af9cc70d01b3549de1b90afce591376ec554737.tar.bz2 dexon-7af9cc70d01b3549de1b90afce591376ec554737.tar.lz dexon-7af9cc70d01b3549de1b90afce591376ec554737.tar.xz dexon-7af9cc70d01b3549de1b90afce591376ec554737.tar.zst dexon-7af9cc70d01b3549de1b90afce591376ec554737.zip | |
fixed merge conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b0c55cc4e..399b6dc88 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # or operating system, you probably want to add a global ignore instead: # git config --global core.excludesfile ~/.gitignore_global +*.swp /tmp */**/*un~ *un~ |