summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-02 12:05:56 -0800
committerJunio C Hamano <gitster@pobox.com>2015-02-02 12:05:56 -0800
commit0d1c285af265459006c012aa4415175c2db961ad (patch)
tree91cdb1c4f760f25361eead20271dc85074343ffb /ll-merge.h
parent15598cf41beed0d86cd2ac443e0f69c5a3b40321 (diff)
parent7471cf88f54990831fe2fd84160350fe432a7b76 (diff)
downloadgit-0d1c285af265459006c012aa4415175c2db961ad.tar.gz
Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po: l10n: ca.po: Fix trailing whitespace
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions