comparison i18n/zh_TW.po @ 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 9e12579369f1
children 4acf569facef
comparison
equal deleted inserted replaced
27457:97cc045f1cfe 27458:d39e743e3578