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