fix wrong stash update

guillaumepotier · Dec 19, 2023 · c5a587c · c5a587c
1 parent 5378cb2
commit c5a587c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/bin/po2json b/bin/po2json
@@ -50,11 +50,7 @@ fs.readFile(argv[2], function (err, buffer) {
     console.log(key, jsonData[key]);
 
     // Do not dump untranslated keys, they already are in the templates!
-<<<<<<< Updated upstream
     if ('' !== jsonData[key][1].length ? jsonData[key][1][0] : jsonData[key][1])
-=======
-    if ('' !== (jsonData[key][1].length ? jsonData[key][1][0] : jsonData[key][1]))
->>>>>>> Stashed changes
       json[key] = 2 === jsonData[key].length ? jsonData[key][1] : jsonData[key].slice(1);
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gettext.js",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "license": "MIT",
   "scripts": {
     "test": "karma start tests/karma.config.js && node tests/po2json.test.js",