diff options
| author | Sam Bingner <sam@bingner.com> | 2018-12-12 12:22:43 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-12-12 12:22:43 -1000 |
| commit | 8392357d8d02c96c1a0b6933c0748e47c29e7e30 (patch) | |
| tree | 768c720bd5ea29f74ef8d24ec04906615d9ab487 /data/apt1.4/_metadata/conflicts | |
| parent | 9a4df01578b80a11383cc2376e38104c7c7644f6 (diff) | |
| parent | 289fb68d04f3511395da101a87a87eb176ef36d4 (diff) | |
Merge testing to master
Diffstat (limited to 'data/apt1.4/_metadata/conflicts')
| -rw-r--r-- | data/apt1.4/_metadata/conflicts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/data/apt1.4/_metadata/conflicts b/data/apt1.4/_metadata/conflicts new file mode 100644 index 000000000..a975dded1 --- /dev/null +++ b/data/apt1.4/_metadata/conflicts @@ -0,0 +1 @@ +apt7 (<<1:0) |