Resolved merge conflicts

This commit is contained in:
Michel Kaporin
2017-03-27 15:47:37 +02:00

View File

@@ -987,5 +987,4 @@ function encodeEntities(value) {
function decodeEntities(value) {
return value.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&');
}
exports.decodeEntities = decodeEntities;
//# sourceMappingURL=i18n.js.map
exports.decodeEntities = decodeEntities;