summaryrefslogtreecommitdiff
path: root/test/pacman/tests/fileconflict001.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-14 08:30:23 -0500
committerDan McGee <dan@archlinux.org>2011-06-14 08:30:23 -0500
commitc206b3a6d503e57691664b94e68ba85760bd0b6c (patch)
treeec90f860d62a5903fb5b0229d61d0bbb34a98ed4 /test/pacman/tests/fileconflict001.py
parentd3553768652cb99ccc944285bfdf618768223dfa (diff)
parent5689478c68bdda8ecbe0eae9a5bd28b072632b26 (diff)
Merge remote-tracking branch 'florian/sodeps'
Diffstat (limited to 'test/pacman/tests/fileconflict001.py')
0 files changed, 0 insertions, 0 deletions