summaryrefslogtreecommitdiff
path: root/data/tar/_metadata/conflicts
AgeCommit message (Expand)Author
2018-12-12Add a conflict to tar to make electra upgrades easierSam Bingner