Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/pactest/tests/fileconflict005.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-09-20 12:09:10 -0500
committerDan McGee <dan@archlinux.org>2009-09-20 12:09:10 -0500
commit6bfca2fd14d07a18d7000d1f9dd998428036656f (patch)
treec766b1ea0071f17857a975b15f53a8f77909f46d /pactest/tests/fileconflict005.py
parentef3716877032941f7882c11c5a091abef95ef983 (diff)
parent338c6546ff86acbb25c1508439adfb89c3dea952 (diff)
Merge branch 'maint'
Message updates made this one a bit messy, but nothing too bad. Conflicts: lib/libalpm/add.c lib/libalpm/remove.c
Diffstat (limited to 'pactest/tests/fileconflict005.py')
0 files changed, 0 insertions, 0 deletions

Copyright © 2002-2022 Judd Vinet and Aaron Griffin. Copyright © 2022 Erich Eckner.
The Arch Linux name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.