Web/CSS/@media の conflicting のファイルを削除 (#965)

Web/CSS/@media は正規の位置にある版が新しく、 conflicting にある2つのファイルは極端に古い（短い）ので、 conflicting 側を削除した。

4 files changed, 5 insertions, 43 deletions

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 6e3d384d7d..0cba14c984 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -362,8 +362,8 @@
 /ja/docs/CSS/ID_selectors-redirect-1	/ja/docs/Web/CSS/ID_selectors
 /ja/docs/CSS/Layout_mode	/ja/docs/Web/CSS/Layout_mode
 /ja/docs/CSS/Length	/ja/docs/Web/CSS/Length
-/ja/docs/CSS/Media	/ja/docs/conflicting/Web/CSS/@media
-/ja/docs/CSS/Media/Visual	/ja/docs/conflicting/Web/CSS/@media_dcb6ae28d731b140b24729ff941686e7
+/ja/docs/CSS/Media	/ja/docs/Web/CSS/@media
+/ja/docs/CSS/Media/Visual	/ja/docs/Web/CSS/@media
 /ja/docs/CSS/Media_queries	/ja/docs/Web/CSS/Media_queries
 /ja/docs/CSS/Multiple_backgrounds	/ja/docs/conflicting/Web/CSS/CSS_Backgrounds_and_Borders/Using_multiple_backgrounds
 /ja/docs/CSS/Other_Resources	/ja/docs/conflicting/Web/CSS_eb0c7d23f84df658710ebb6b4bdec8ea
@@ -641,7 +641,7 @@
 /ja/docs/CSS:Getting_Started:Text_styles	/ja/docs/Learn/CSS/Styling_text/Fundamentals
 /ja/docs/CSS:Getting_Started:What_is_CSS	/en-US/docs/Learn/CSS/First_steps/How_CSS_works
 /ja/docs/CSS:Getting_Started:Why_use_CSS	/en-US/docs/Learn/CSS/First_steps/How_CSS_works
-/ja/docs/CSS:Media:Visual	/ja/docs/conflicting/Web/CSS/@media_dcb6ae28d731b140b24729ff941686e7
+/ja/docs/CSS:Media:Visual	/ja/docs/Web/CSS/@media
 /ja/docs/CSS:Other_Resources	/ja/docs/conflicting/Web/CSS_eb0c7d23f84df658710ebb6b4bdec8ea
 /ja/docs/CSS:color	/ja/docs/Web/CSS/color
 /ja/docs/CSS:computed_value	/ja/docs/Web/CSS/computed_value
@@ -4358,8 +4358,8 @@
 /ja/docs/Web/CSS/Getting_started/Text_styles	/ja/docs/Learn/CSS/Styling_text/Fundamentals
 /ja/docs/Web/CSS/Getting_started/What_is_CSS	/en-US/docs/Learn/CSS/First_steps/How_CSS_works
 /ja/docs/Web/CSS/Index	/ja/docs/orphaned/Web/CSS/Index
-/ja/docs/Web/CSS/Media	/ja/docs/conflicting/Web/CSS/@media
-/ja/docs/Web/CSS/Media/Visual	/ja/docs/conflicting/Web/CSS/@media_dcb6ae28d731b140b24729ff941686e7
+/ja/docs/Web/CSS/Media	/ja/docs/Web/CSS/@media
+/ja/docs/Web/CSS/Media/Visual	/ja/docs/Web/CSS/@media
 /ja/docs/Web/CSS/Motion_Path	/ja/docs/Web/CSS/CSS_Motion_Path
 /ja/docs/Web/CSS/Other_Resources	/ja/docs/conflicting/Web/CSS_eb0c7d23f84df658710ebb6b4bdec8ea
 /ja/docs/Web/CSS/Reference/@viewport	/ja/docs/Web/CSS/@viewport
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": [
diff --git a/files/ja/conflicting/web/css/@media/index.html b/files/ja/conflicting/web/css/@media/index.html
deleted file mode 100644
index 54635c83da..0000000000
--- a/files/ja/conflicting/web/css/@media/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Media
-slug: conflicting/Web/CSS/@media
-original_slug: Web/CSS/Media
----
-{{wiki.localize('System.API.page-generated-for-subpage')}}
diff --git a/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html b/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html
deleted file mode 100644
index 25382e211f..0000000000
--- a/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: Visual
-slug: conflicting/Web/CSS/@media_dcb6ae28d731b140b24729ff941686e7
-tags:
-  - CSS
-  - CSS Reference
-  - MDC Project
-  - NeedsContent
-translation_of: Web/CSS/@media
-translation_of_original: Web/CSS/media/visual
-original_slug: Web/CSS/Media/Visual
----
-<div>{{ CSSRef() }}</div>
-<p><a href="/ja/CSS" title="ja/CSS">CSS</a> 標準で定義された<a href="/ja/CSS/@media#Media_groups" title="ja/CSS/@media#Media_groups">メディアグループ</a>。</p>
-<h2 id="英語版章題(See_also)_参照">{{ 英語版章題("See also") }}参照</h2>
-<p><a class="external" href="http://www.w3.org/TR/CSS2/media.html" title="W3C Media Types Spec">W3C Media Types Spec</a></p>
-<p><span class="comment">Interwiki Languages Links</span></p>
-<div>{{ languages( { "en": "en/CSS/Media/Visual", "es": "es/CSS/Media/Visual", "fr": "fr/CSS/M\u00e9dia/Visuel", "pl": "pl/CSS/Media/Visual", "zh-cn": "cn/CSS/Media/Visual" } ) }}</div>