summaryrefslogtreecommitdiff
path: root/data/libapt/_metadata/conflicts
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2018-12-16 11:52:18 -1000
committerSam Bingner <sam@bingner.com>2018-12-16 11:52:18 -1000
commit570d423532176c39518f3978a203250bef41cfef (patch)
treef7b690889bfbf755a61eb9092ea3c8b126b6b9ea /data/libapt/_metadata/conflicts
parentb48f34eee35e3c3594a5b9e5f64ddc6e0fc84201 (diff)
A number of updates to make transitioning from electra repo smoother
Diffstat (limited to 'data/libapt/_metadata/conflicts')
-rw-r--r--data/libapt/_metadata/conflicts2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/libapt/_metadata/conflicts b/data/libapt/_metadata/conflicts
index 77c98489a..7e4d0927b 100644
--- a/data/libapt/_metadata/conflicts
+++ b/data/libapt/_metadata/conflicts
@@ -1 +1 @@
-apt7-lib (<<1:0)
+apt7-lib (<<1:0), apt7 (<<1:0), com.mc.xz, apt7-key