From fc1482b743e8f428c77adadeebbe243b94f9a7c9 Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Fri, 2 Jul 2021 23:31:38 +0900
Subject: Web/JavaScript/Guide を更新 (#1260)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- conflicting 版を英語版に準じてリダイレクトに変更
- 2021/05/22 時点の英語版に同期
---
 files/ja/_wikihistory.json | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'files/ja/_wikihistory.json')

diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 2e9e9b0bf8..f75dab2def 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -49070,22 +49070,6 @@
       "RobinEgg"
     ]
   },
-  "conflicting/Web/JavaScript/Guide": {
-    "modified": "2019-03-24T00:01:12.633Z",
-    "contributors": [
-      "teoli",
-      "ethertank",
-      "happysadman",
-      "Mgjbot",
-      "electrolysis"
-    ]
-  },
-  "conflicting/Web/JavaScript/Guide_552be6201ec831852573aad295c96538": {
-    "modified": "2019-03-23T23:28:49.183Z",
-    "contributors": [
-      "ethertank"
-    ]
-  },
   "conflicting/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat": {
     "modified": "2020-10-15T21:36:10.939Z",
     "contributors": [
-- 
cgit v1.2.3-54-g00ecf