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-08-01 13:06:28 -0500
committerDan McGee <dan@archlinux.org>2009-08-01 13:06:28 -0500
commitcfc4c24db290a7e91fc32b162287b60c44c065dd (patch)
tree868d498e8972f8a6617f8395025bafff7672816f /pactest/tests/fileconflict005.py
parentbf9249e9299ea3d1817f3176a18d1711c6fe169a (diff)
parent4cadee4f08263b269f8da32c4aef6f0d2b578a9d (diff)
Merge commit 'xavier/trans'
Diffstat (limited to 'pactest/tests/fileconflict005.py')
0 files changed, 0 insertions, 0 deletions