conflict cleanup for zh-TW (Part 6) (#7833)

mdn · Aug 20, 2022 · cc3f8ba · cc3f8ba
1 parent 3a96fa5
commit cc3f8ba
Show file tree

Hide file tree

Showing 20 changed files with 62 additions and 1,777 deletions.
diff --git a/files/zh-tw/_redirects.txt b/files/zh-tw/_redirects.txt
diff --git a/files/zh-tw/_wikihistory.json b/files/zh-tw/_wikihistory.json
@@ -7767,129 +7767,5 @@
       "Shiyou",
       "alk03073135"
     ]
-  },
-  "conflicting/Web/JavaScript/Guide": {
-    "modified": "2019-03-24T00:01:19.124Z",
-    "contributors": [
-      "wbamberg",
-      "Jaja",
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide/Grammar_and_types": {
-    "modified": "2019-01-16T14:44:25.337Z",
-    "contributors": [
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide/Grammar_and_types_5c6f30ff8e011c45a011b9c8f3b5bcea": {
-    "modified": "2019-01-16T14:44:19.901Z",
-    "contributors": [
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide/Grammar_and_types_d57082c2207b466127d8dc34a980addf": {
-    "modified": "2019-01-16T14:44:20.274Z",
-    "contributors": [
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide/Grammar_and_types_e5a53691c318855e3342ad91feb78f2e": {
-    "modified": "2019-01-16T14:44:19.601Z",
-    "contributors": [
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide/Grammar_and_types_ef6fc79abc28f5eadd6c126341df5e49": {
-    "modified": "2019-01-16T14:44:20.971Z",
-    "contributors": [
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide/Regular_Expressions": {
-    "modified": "2019-01-16T14:44:21.287Z",
-    "contributors": [
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide/Regular_Expressions_24eb6498b86da57e7fb5337fd8fa04a6": {
-    "modified": "2019-01-16T14:44:25.974Z",
-    "contributors": [
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide/Regular_Expressions_38b32725e0e3217a5542b1b4ee122407": {
-    "modified": "2019-01-16T14:44:23.103Z",
-    "contributors": [
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide/Working_with_Objects": {
-    "modified": "2019-01-16T14:44:03.755Z",
-    "contributors": [
-      "teoli",
-      "happysadman"
-    ]
-  },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/ArrayBuffer": {
-    "modified": "2019-03-23T22:31:10.924Z",
-    "contributors": [
-      "teoli",
-      "jackblackevo"
-    ]
-  },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/Date": {
-    "modified": "2019-03-23T22:26:36.902Z",
-    "contributors": [
-      "ddtet"
-    ]
-  },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/Function": {
-    "modified": "2019-03-23T22:30:13.335Z",
-    "contributors": [
-      "jackblackevo"
-    ]
-  },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/Number": {
-    "modified": "2020-10-15T21:56:46.161Z",
-    "contributors": [
-      "jsgao0"
-    ]
-  },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/Object": {
-    "modified": "2019-03-23T22:44:24.956Z",
-    "contributors": [
-      "Shiyou",
-      "alk03073135"
-    ]
-  },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/Promise": {
-    "modified": "2020-10-15T21:51:00.110Z",
-    "contributors": [
-      "nyngwang",
-      "jackblackevo"
-    ]
-  },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/String": {
-    "modified": "2020-10-15T22:02:57.359Z",
-    "contributors": [
-      "SphinxKnight",
-      "bine139488"
-    ]
-  },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/String_6fa58bba0570d663099f0ae7ae8883ab": {
-    "modified": "2019-03-23T22:48:01.923Z",
-    "contributors": [
-      "Shiyou"
-    ]
   }
 }
diff --git a/files/zh-tw/conflicting/web/javascript/guide/grammar_and_types/index.html b/files/zh-tw/conflicting/web/javascript/guide/grammar_and_types/index.html
diff --git a/...icting/web/javascript/guide/grammar_and_types_5c6f30ff8e011c45a011b9c8f3b5bcea/index.html b/...icting/web/javascript/guide/grammar_and_types_5c6f30ff8e011c45a011b9c8f3b5bcea/index.html