From 90e42d68d03a3ee0ab3b1e2728826977800b56c9 Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Wed, 2 Jun 2021 23:39:30 +0900
Subject: Web/CSS/@media の conflicting のファイルを削除 (#965)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Web/CSS/@media は正規の位置にある版が新しく、 conflicting にある2つのファイルは極端に古い（短い）ので、 conflicting 側を削除した。
---
 files/ja/_wikihistory.json | 14 --------------
 1 file changed, 14 deletions(-)

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

diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 24f95231ff..8782f0aad8 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -49397,20 +49397,6 @@
       "Marsf"
     ]
   },
-  "conflicting/Web/CSS/@media": {
-    "modified": "2019-01-16T15:23:43.629Z",
-    "contributors": [
-      "ethertank",
-      "Anonymous"
-    ]
-  },
-  "conflicting/Web/CSS/@media_dcb6ae28d731b140b24729ff941686e7": {
-    "modified": "2019-03-24T00:17:11.661Z",
-    "contributors": [
-      "ethertank",
-      "Marsf"
-    ]
-  },
   "conflicting/Web/CSS/@viewport": {
     "modified": "2020-10-15T22:35:00.773Z",
     "contributors": [
-- 
cgit v1.2.3-54-g00ecf