diff options
author | Cody P Schafer | 2020-10-01 23:16:12 -0400 |
---|---|---|
committer | Cody P Schafer | 2020-10-06 00:01:09 -0400 |
commit | b9c4cdb23f663f6f3827a525bdcd714b6b678d89 (patch) | |
tree | a70d4dd3ad37291623a9f604a9e6cf687531df6f /.gitignore | |
parent | 34ad154188a24dfa48acd62793dc5798f36e1a24 (diff) | |
download | aur-b9c4cdb23f663f6f3827a525bdcd714b6b678d89.tar.gz |
use debian p14 as the basis
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 |