aboutsummaryrefslogtreecommitdiff
path: root/files/zh-tw/_wikihistory.json
diff options
context:
space:
mode:
Diffstat (limited to 'files/zh-tw/_wikihistory.json')
-rw-r--r--files/zh-tw/_wikihistory.json24
1 files changed, 12 insertions, 12 deletions
diff --git a/files/zh-tw/_wikihistory.json b/files/zh-tw/_wikihistory.json
index 3b23303592..d0f838a37b 100644
--- a/files/zh-tw/_wikihistory.json
+++ b/files/zh-tw/_wikihistory.json
@@ -1668,7 +1668,7 @@
"MashKao"
]
},
- "Learn/JavaScript/Objects/Inheritance": {
+ "Learn/JavaScript/Objects/Classes_in_JavaScript": {
"modified": "2020-07-16T22:32:17.083Z",
"contributors": [
"tangerine1202",
@@ -1684,17 +1684,6 @@
"MashKao"
]
},
- "Learn/JavaScript/Objects/Object-oriented_JS": {
- "modified": "2020-07-16T22:32:09.821Z",
- "contributors": [
- "DahisC",
- "tangerine1202",
- "iigmir",
- "cjchng",
- "roycrxtw",
- "MashKao"
- ]
- },
"Learn/JavaScript/Objects/Object_building_practice": {
"modified": "2020-07-16T22:32:33.523Z",
"contributors": [
@@ -7979,6 +7968,17 @@
"sailplaneTW"
]
},
+ "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
+ "modified": "2020-07-16T22:32:09.821Z",
+ "contributors": [
+ "DahisC",
+ "tangerine1202",
+ "iigmir",
+ "cjchng",
+ "roycrxtw",
+ "MashKao"
+ ]
+ },
"conflicting/Learn/Server-side/Django": {
"modified": "2019-03-23T23:33:19.493Z",
"contributors": [