Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/pactest/tests/fileconflict004.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-10-28 22:20:09 -0500
committerDan McGee <dan@archlinux.org>2008-10-28 22:20:09 -0500
commitcd51abf0c8d04c72cc85b28cd45b33b9020c661e (patch)
tree18955197d51d579f319792fe473ef1df13dbf175 /pactest/tests/fileconflict004.py
parent2e431e1cc3c9bb445ea886521117f483e78aa84a (diff)
parenta63aeed562c8bdd6604ec50e6a4b684f6edabda3 (diff)
Merge branch 'maint'
Diffstat (limited to 'pactest/tests/fileconflict004.py')
0 files changed, 0 insertions, 0 deletions