summaryrefslogtreecommitdiff
path: root/file-conflicts
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-04-05 15:23:47 +0200
committerErich Eckner <git@eckner.net>2020-04-05 15:23:47 +0200
commit38cacf31721f9a8c21d5a96fa7be1b69e5a87158 (patch)
tree51a5683605e724cdaab903d4ea8a987d2f1c4a87 /file-conflicts
parentf072d76c23f934c1d27949d7dacf94cdcbbb3273 (diff)
downloadarchlinuxewe-38cacf31721f9a8c21d5a96fa7be1b69e5a87158.tar.xz
shutdownasap 0.8.4-1 -> 0.8.5-1
Diffstat (limited to 'file-conflicts')
0 files changed, 0 insertions, 0 deletions