diff options
| author | Doug Newgard | 2013-03-17 12:38:31 -0500 |
|---|---|---|
| committer | Doug Newgard | 2013-03-23 02:22:54 -0500 |
| commit | 8caee1b78c1c9f085d22f5e2f0e6b4440f961d1a (patch) | |
| tree | f022304ff2a74dfe58ea2eaa7fad6083c5cb6e6f /.gitignore | |
| parent | 975f38c4a3457529441330205e6ac870595f67d8 (diff) | |
| download | aur-8caee1b78c1c9f085d22f5e2f0e6b4440f961d1a.tar.gz | |
Makepkg 4.1 update
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 |