aboutsummaryrefslogtreecommitdiff
path: root/files/es/_wikihistory.json
diff options
context:
space:
mode:
Diffstat (limited to 'files/es/_wikihistory.json')
-rw-r--r--files/es/_wikihistory.json40
1 files changed, 20 insertions, 20 deletions
diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json
index dc0fdd2b06..889610fe22 100644
--- a/files/es/_wikihistory.json
+++ b/files/es/_wikihistory.json
@@ -3249,7 +3249,7 @@
"kevin-loal98"
]
},
- "Learn/JavaScript/Objects/Inheritance": {
+ "Learn/JavaScript/Objects/Classes_in_JavaScript": {
"modified": "2020-07-28T01:53:21.821Z",
"contributors": [
"Fernando-Funes",
@@ -3268,25 +3268,6 @@
"Enesimus"
]
},
- "Learn/JavaScript/Objects/Object-oriented_JS": {
- "modified": "2020-08-08T09:41:13.386Z",
- "contributors": [
- "Nachec",
- "andyesp",
- "Fernando-Funes",
- "jhonarielgj",
- "rimbener",
- "ReneAG",
- "EnekoOdoo",
- "ivanagui2",
- "cristianmarquezp",
- "djdouta",
- "paulaco",
- "martinGerez",
- "anyruizd",
- "Michelangeur"
- ]
- },
"Learn/JavaScript/Objects/Object_building_practice": {
"modified": "2020-07-16T22:32:30.877Z",
"contributors": [
@@ -21214,6 +21195,25 @@
"StripTM"
]
},
+ "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
+ "modified": "2020-08-08T09:41:13.386Z",
+ "contributors": [
+ "Nachec",
+ "andyesp",
+ "Fernando-Funes",
+ "jhonarielgj",
+ "rimbener",
+ "ReneAG",
+ "EnekoOdoo",
+ "ivanagui2",
+ "cristianmarquezp",
+ "djdouta",
+ "paulaco",
+ "martinGerez",
+ "anyruizd",
+ "Michelangeur"
+ ]
+ },
"conflicting/MDN/Contribute/Getting_started": {
"modified": "2019-01-16T18:56:38.941Z",
"contributors": [