diff options
author | Michael Vogt <mvo@debian.org> | 2014-06-18 10:46:08 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-06-18 10:46:08 +0200 |
commit | b6fea8bbe25e3c0312de72c99b0d49c699d02b7b (patch) | |
tree | e0f1b5f51e568be9370dece04ede0352ee37684a /test/integration/test-ignore-provides-if-versioned-conflicts | |
parent | da029b0aaebdc64a3a9f6b7012213539421c934b (diff) | |
parent | 59194959326dbf114a5c894e4279c04844b4a793 (diff) |
Merge remote-tracking branch 'mvo/feature/update-by-hash' into debian/experimental
Diffstat (limited to 'test/integration/test-ignore-provides-if-versioned-conflicts')
0 files changed, 0 insertions, 0 deletions