From b12303ff65aeff8b54d47fa2d8c6342b72ad6b90 Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Wed, 11 Aug 2021 23:00:02 +0900
Subject: conflicting/Learn 以下を削除 (#1821)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

正規版の文書で内容が充分であると思われるため、 conflicting 版は削除
---
 files/ja/_wikihistory.json | 9 ---------
 1 file changed, 9 deletions(-)

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

diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index f232dca527..e7ec09ede2 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -48375,15 +48375,6 @@
       "silverskyvicto"
     ]
   },
-  "conflicting/Learn/JavaScript/Building_blocks/Events": {
-    "modified": "2019-11-20T21:35:36.010Z",
-    "contributors": [
-      "wbamberg",
-      "dskmori",
-      "yamaguchi-takayuki",
-      "mikamikuh"
-    ]
-  },
   "conflicting/MDN/Yari": {
     "modified": "2020-08-13T21:26:07.304Z",
     "contributors": [
-- 
cgit v1.2.3-54-g00ecf