Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/pactest/tests/depconflict111.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-01-19 22:03:54 -0600
committerDan McGee <dan@archlinux.org>2010-01-19 22:03:54 -0600
commit0eadc992400aaad58da5866d23caee01a22e1341 (patch)
tree0e7a59fb50699b7f54a574ca7aaac2ebe6c40dc8 /pactest/tests/depconflict111.py
parentafc37c58c74848a11adb04b0ae182cca467cd25e (diff)
parent8b3f5f0ce6dca98ca14cc48f5a85188313769b40 (diff)
Merge branch 'maint'
Just a slight touchup in makepkg due to the [ -> [[ conversion, so nothing to see here. Conflicts: scripts/makepkg.sh.in
Diffstat (limited to 'pactest/tests/depconflict111.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.