diff options
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 7d813751c966..b39593800d1e 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +<<<<<<< HEAD src srcdir pkg @@ -9,3 +10,8 @@ pkgdir *.tar *.zip *.rar +======= +*.tar.* +pkg/ +src/ +>>>>>>> c7bac17... init |