From 6f301f5f8eb03eee8b590b6451cf812cfb7a982d Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Thu, 29 Jul 2021 14:06:56 +0900
Subject: conflicting/Web/CSS/font-variant を削除 (#1524)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原文が英語版で既に削除されている記事なので削除
---
 files/ja/_redirects.txt                            |  4 +--
 files/ja/_wikihistory.json                         |  7 ----
 .../ja/conflicting/web/css/font-variant/index.html | 38 ----------------------
 3 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 files/ja/conflicting/web/css/font-variant/index.html

(limited to 'files/ja')

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index ba3b924afc..24bff1e4dc 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -535,7 +535,7 @@
 /ja/docs/CSS/min-height	/ja/docs/Web/CSS/min-height
 /ja/docs/CSS/min-width	/ja/docs/Web/CSS/min-width
 /ja/docs/CSS/none	/ja/docs/conflicting/Web/CSS/float
-/ja/docs/CSS/normal	/ja/docs/conflicting/Web/CSS/font-variant
+/ja/docs/CSS/normal	/ja/docs/Web/CSS/font-variant
 /ja/docs/CSS/number	/ja/docs/Web/CSS/number
 /ja/docs/CSS/opacity	/ja/docs/Web/CSS/opacity
 /ja/docs/CSS/order	/ja/docs/Web/CSS/order
@@ -4243,7 +4243,7 @@
 /ja/docs/Web/CSS/min	/ja/docs/Web/CSS/min()
 /ja/docs/Web/CSS/minmax	/ja/docs/Web/CSS/minmax()
 /ja/docs/Web/CSS/none	/ja/docs/conflicting/Web/CSS/float
-/ja/docs/Web/CSS/normal	/ja/docs/conflicting/Web/CSS/font-variant
+/ja/docs/Web/CSS/normal	/ja/docs/Web/CSS/font-variant
 /ja/docs/Web/CSS/paint	/ja/docs/orphaned/Web/CSS/paint()
 /ja/docs/Web/CSS/paint()	/ja/docs/orphaned/Web/CSS/paint()
 /ja/docs/Web/CSS/radial-gradient	/ja/docs/orphaned/Web/CSS/radial-gradient()
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 73bf260491..3c142eba35 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -48382,13 +48382,6 @@
       "Marsf"
     ]
   },
-  "conflicting/Web/CSS/font-variant": {
-    "modified": "2019-03-23T23:39:40.673Z",
-    "contributors": [
-      "ethertank",
-      "Marsf"
-    ]
-  },
   "conflicting/Web/CSS/url()": {
     "modified": "2020-10-15T21:22:36.291Z",
     "contributors": [
diff --git a/files/ja/conflicting/web/css/font-variant/index.html b/files/ja/conflicting/web/css/font-variant/index.html
deleted file mode 100644
index d0b2e6859e..0000000000
--- a/files/ja/conflicting/web/css/font-variant/index.html
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: normal
-slug: conflicting/Web/CSS/font-variant
-tags:
-  - CSS Reference
-translation_of: Web/CSS/font-variant
-translation_of_original: Web/CSS/normal
-original_slug: Web/CSS/normal
----
-<div>
-  {{CSSRef}}</div>
-<h2 id="Summary" name="Summary">概要</h2>
-<p><strong><code>normal</code></strong> は幾つかの CSS プロパティで使用される一般的な値です。そのプロパティの「標準値」を意味し、多くの場合は初期値となります。よく似た値として {{Cssxref("none")}} が有ります。</p>
-<h2 id="Used_in" name="Used_in">normal が使用可能な CSS プロパティ</h2>
-<dl>
-  <dt>
-    {{Cssxref("font-weight")}}</dt>
-  <dd>
-    <code>normal</code> を指定した場合、font-weight プロパティの基準値（<code>400</code>）と同等となります。太字にも細字にもなりません。</dd>
-  <dt>
-    {{Cssxref("font-style")}}</dt>
-  <dd>
-    <code>normal</code> を指定した場合、italic や oblique でない、通常のスタイルで文字がレンダリングされます。</dd>
-  <dt>
-    {{Cssxref("word-spacing")}}</dt>
-  <dd>
-    <code>normal</code> を指定した場合、フォントの標準的な字間で文字がレンダリングされます。</dd>
-</dl>
-<p>他にも、以下の様なプロパティ等で <code>normal</code> が指定可能です。</p>
-<ul>
-  <li>{{Cssxref("font-variant")}}</li>
-  <li>{{Cssxref("letter-spacing")}}</li>
-  <li>{{Cssxref("white-space")}}</li>
-  <li>{{Cssxref("speak")}}</li>
-  <li>{{Cssxref("unicode-bidi")}}</li>
-  <li>{{Cssxref("line-height")}}</li>
-  <li>{{Cssxref("content")}}</li>
-</ul>
-- 
cgit v1.2.3-54-g00ecf