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>2009-10-11 12:57:57 -0500
committerDan McGee <dan@archlinux.org>2009-10-11 12:57:57 -0500
commitcf0d619670a4d0c67ad67e22bacbb69c203714f5 (patch)
treeb4edada535df2b5beda4d9bcaf0f62e406a9c164 /pactest/tests/fileconflict004.py
parent8e7652f1afd7ba5198f3aa10a94c50bb67f7a407 (diff)
parent5e03941ee5fbd0cc69ac83e2dd6ad6d3e6d940cd (diff)
Merge branch 'maint'
Diffstat (limited to 'pactest/tests/fileconflict004.py')
0 files changed, 0 insertions, 0 deletions