diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e4fa42cf9be4..23fcafcc4b6a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ src/ pkg/ *.tar.* +<<<<<<< HEAD +======= +*.log +>>>>>>> Makepkg 4.1 update |