From 6e81e851ba44d4092ea842c0976e5576d82aae47 Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Tue, 13 Jul 2021 02:48:34 +0900
Subject: Web/HTML/Element を更新 (#1374)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Web/HTML/Element を更新

- conflicting 版を削除
- 正規版を 2021/05/14 時点の英語版に同期

* Web/HTTP/Connection_management_in_HTTP_1.x を更新

- conflicting 版は正規版に吸収されているため削除
- 2021/02/16 時点の英語版に同期

* Revert "Web/HTTP/Connection_management_in_HTTP_1.x を更新"

This reverts commit 8e5bde905d4c901605e982e67c15c05339005574.
---
 files/ja/_wikihistory.json | 10 ----------
 1 file changed, 10 deletions(-)

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

diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 619112d948..0dee16d4be 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -48585,16 +48585,6 @@
       "Yuuki Takahashi"
     ]
   },
-  "conflicting/Web/HTML/Element": {
-    "modified": "2019-06-25T21:28:01.239Z",
-    "contributors": [
-      "michi-h0623",
-      "mfuji09",
-      "wbamberg",
-      "ethertank",
-      "saneyuki_s"
-    ]
-  },
   "conflicting/Web/HTML/Global_attributes": {
     "modified": "2019-03-18T20:53:18.763Z",
     "contributors": [
-- 
cgit v1.2.3-54-g00ecf