From edcbfa42307307b620944e0aa4f6125d47e811eb Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Fri, 25 Jun 2021 01:34:02 +0900
Subject: Web/API/Canvas_API/Tutorial を更新 (conflicting と統合) (#1207)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- conflicting 版の方が原文に近かったので、こちらを正規版に置き換え
- Tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d は内容が古く、他の記事でカバーされていると考えられるため削除
- 履歴とリダイレクトを修正
---
 files/ja/_wikihistory.json | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

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

diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 16b74330ec..85fd91846b 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -11441,6 +11441,8 @@
   "Web/API/Canvas_API/Tutorial": {
     "modified": "2020-09-06T11:19:42.533Z",
     "contributors": [
+      "Uemmra3",
+      "yyss",
       "ryokohbato",
       "Hakuyoka",
       "mfuji09",
@@ -48719,29 +48721,6 @@
       "yuki_nichiyama"
     ]
   },
-  "conflicting/Web/API/Canvas_API/Tutorial": {
-    "modified": "2019-03-23T23:28:30.956Z",
-    "contributors": [
-      "Uemmra3",
-      "yyss",
-      "ethertank"
-    ]
-  },
-  "conflicting/Web/API/Canvas_API/Tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d": {
-    "modified": "2019-03-23T23:54:18.694Z",
-    "contributors": [
-      "mfuji09",
-      "SphinxKnight",
-      "teoli",
-      "ethertank",
-      "Marsf",
-      "Mgjbot",
-      "Okome",
-      "Taken",
-      "Shimono",
-      "Victory"
-    ]
-  },
   "conflicting/Web/API/Crypto/getRandomValues": {
     "modified": "2019-03-23T22:01:08.359Z",
     "contributors": [
-- 
cgit v1.2.3-54-g00ecf