From 4a27f5718a8ab97c27690bebb27c7b836e5bd529 Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Tue, 13 Jul 2021 03:08:55 +0900
Subject: Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat を更新
 (#1510)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- conflicting 版は prototype オブジェクトのためのものなので削除
- 2021/07/04 時点の英語版に同期
---
 files/ja/_wikihistory.json | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 6f5f7185f3..13ecfd40e7 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -48611,12 +48611,10 @@
       "Kohei"
     ]
   },
-  "conflicting/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat": {
-    "modified": "2020-10-15T21:36:10.939Z",
+  "conflicting/Web/HTTP/Headers/X-DNS-Prefetch-Control": {
+    "modified": "2019-03-24T00:00:27.042Z",
     "contributors": [
-      "fscholz",
-      "mfuji09",
-      "shide55"
+      "RobinEgg"
     ]
   },
   "conflicting/Web/JavaScript/Reference/Global_Objects/JSON": {
-- 
cgit v1.2.3-54-g00ecf