diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-04-16 14:05:43 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-04-16 14:05:43 -0500 |
commit | 0bb0476a6cff7b5ad79c518bcb95c6ee170b0ac9 (patch) | |
tree | c327ff49f49200ddc184a4e1a2f1aee7144c4c87 /.gitignore | |
parent | 375f87c696cb7838c17922a83e956adbec8ef414 (diff) | |
parent | 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 (diff) |
Merge branch 'master' of git://projects.archlinux.org/dbscripts
Conflicts:
db-functions
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,4 +2,4 @@ *.pyc local_config /config.local -test/packages/*/*.pkg.tar.* +test/packages/*/*.pkg.tar.?z |