summaryrefslogtreecommitdiff
path: root/po/POTFILES.in
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-10 22:48:16 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-11 15:06:22 +0200
commit4d91eec42d3ba547c4e2578df0d6fd568075647b (patch)
tree0017e196985a4d20a0d0d587314ad7b926233589 /po/POTFILES.in
parent3ef64445cdf12d7703aa79b39f3c170037d587c7 (diff)
resolved: actually, the peer with the lower IP address wins conflicts
Diffstat (limited to 'po/POTFILES.in')
0 files changed, 0 insertions, 0 deletions