From b24a7c17ac0ba06362081c20db14f74d0236c873 Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Thu, 29 Jul 2021 14:07:35 +0900
Subject: conflicting/Web/Guide/Introduction_to_Web_development を削除 (#1525)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* conflicting/Web/Guide/Introduction_to_Web_development を削除

記事の古い版と思われるため、履歴を含めて正規版に統合
---
 files/ja/_wikihistory.json | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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

diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 3c142eba35..fc25a1de48 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -33374,7 +33374,11 @@
     "modified": "2020-05-04T12:39:54.645Z",
     "contributors": [
       "Uemmra3",
-      "silverskyvicto"
+      "silverskyvicto",
+      "mfuji09",
+      "SphinxKnight",
+      "nonki777",
+      "Yuuki Takahashi"
     ]
   },
   "Web/Guide/Mobile": {
@@ -48415,15 +48419,6 @@
       "Okome"
     ]
   },
-  "conflicting/Web/Guide/Introduction_to_Web_development": {
-    "modified": "2019-03-24T00:07:37.444Z",
-    "contributors": [
-      "mfuji09",
-      "SphinxKnight",
-      "nonki777",
-      "Yuuki Takahashi"
-    ]
-  },
   "conflicting/Web/HTTP/Headers/User-Agent/Firefox": {
     "modified": "2019-03-23T23:58:03.561Z",
     "contributors": [
-- 
cgit v1.2.3-54-g00ecf