summaryrefslogtreecommitdiff
path: root/locale/babel.map
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-07-29 21:54:57 +0200
committerChristian Grothoff <christian@grothoff.org>2017-07-29 21:54:57 +0200
commit83d6043ba3fb3eb25f489f5a10db7778055ae617 (patch)
tree855c818d3ca9f00d03516f8cfb8b11f9f0ee447a /locale/babel.map
parente773fff8a353488d54b394f6926721ccd8f6ae18 (diff)
parentbdc1672325bcd3649c02f9936d2681230a389b7c (diff)
downloadwww-83d6043ba3fb3eb25f489f5a10db7778055ae617.tar.gz
www-83d6043ba3fb3eb25f489f5a10db7778055ae617.tar.bz2
www-83d6043ba3fb3eb25f489f5a10db7778055ae617.zip
resolving merge conflicts
Diffstat (limited to 'locale/babel.map')
0 files changed, 0 insertions, 0 deletions