summaryrefslogtreecommitdiff
path: root/file-conflicts
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-05-18 21:49:09 +0200
committerErich Eckner <git@eckner.net>2020-05-18 21:50:04 +0200
commitd8d29e688611da22672582f08bc30c0aaf8c707c (patch)
tree45f7e1cdc5632a186768dfa25cfc0bf73f7e3472 /file-conflicts
parent822b77e5af362f68ef91debfcaf484f38f1cfe1d (diff)
downloadarchlinuxewe.git.save-d8d29e688611da22672582f08bc30c0aaf8c707c.tar.xz
openttd-git: 29435.93d1d8773-1 -> 29435.93d1d8773-2
Diffstat (limited to 'file-conflicts')
0 files changed, 0 insertions, 0 deletions