comparison i18n/check-translation.py @ 27458:d39e743e3578

rebase: mention conflict in documentation instead of merge
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 18:32:15 +0000
parents 3fb36dec1727
children 29238dbf718e
comparison
equal deleted inserted replaced
27457:97cc045f1cfe 27458:d39e743e3578