summaryrefslogtreecommitdiff
path: root/test/integration/test-ignore-provides-if-versioned-conflicts
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-23 15:49:05 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-23 15:49:05 +0200
commita944ebe7e17d4f7fdb6540babe5bb2b71cc84053 (patch)
tree951be6d719d2b0dcdf0186e25bd3c75866cbe921 /test/integration/test-ignore-provides-if-versioned-conflicts
parentdb1d1c32149177c0b6ca49e5107ab1f5fd364660 (diff)
parenta1380a5c52062b25c9ed260b721239ed57929503 (diff)
Merge remote-tracking branch 'debian/debian/experimental' into feature/acq-trans
Diffstat (limited to 'test/integration/test-ignore-provides-if-versioned-conflicts')
0 files changed, 0 insertions, 0 deletions