From 752741e4281053989f29ee6a55b6ad5ccd72a9a5 Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Tue, 10 Aug 2021 15:05:42 +0900
Subject: conflicting/Web/CSS/float を削除 (#1857)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/ja/_redirects.txt                       |  2 --
 files/ja/_wikihistory.json                    |  8 -------
 files/ja/conflicting/web/css/float/index.html | 33 ---------------------------
 3 files changed, 43 deletions(-)
 delete mode 100644 files/ja/conflicting/web/css/float/index.html

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 7c34195adb..2a5aaaeef5 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -533,7 +533,6 @@
 /ja/docs/CSS/max-width	/ja/docs/Web/CSS/max-width
 /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/Web/CSS/font-variant
 /ja/docs/CSS/number	/ja/docs/Web/CSS/number
 /ja/docs/CSS/opacity	/ja/docs/Web/CSS/opacity
@@ -3894,7 +3893,6 @@
 /ja/docs/Web/CSS/max	/ja/docs/Web/CSS/max()
 /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/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()
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index b3575c3d1f..4f461a40d0 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -48504,14 +48504,6 @@
       "Marsf"
     ]
   },
-  "conflicting/Web/CSS/float": {
-    "modified": "2019-03-24T00:02:58.592Z",
-    "contributors": [
-      "ethertank",
-      "sosleepy",
-      "Marsf"
-    ]
-  },
   "conflicting/Web/CSS/url()": {
     "modified": "2020-10-15T21:22:36.291Z",
     "contributors": [
diff --git a/files/ja/conflicting/web/css/float/index.html b/files/ja/conflicting/web/css/float/index.html
deleted file mode 100644
index bf8bb57433..0000000000
--- a/files/ja/conflicting/web/css/float/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: none
-slug: conflicting/Web/CSS/float
-tags:
-  - CSS
-  - CSS Reference
-translation_of: Web/CSS/float
-translation_of_original: Web/CSS/none
-original_slug: Web/CSS/none
----
-<div>
-  {{CSSRef()}}</div>
-<h2 id="Summary" name="Summary">概要</h2>
-<p><strong><code>none</code></strong> キーワードは、多くの CSS プロパティで使用される共通の値です。デフォルト値であることが多いですが、そのプロパティの「標準値」を意味し、多くの場合は初期値となります。よく似た値として {{ Cssxref("normal") }} が有ります。</p>
-<h2 id="Used_in" name="Used_in">none 値が使用可能な CSS プロパティ</h2>
-<ul>
-  <li>{{ Cssxref("float") }}<br>
-    要素はフロートしません。</li>
-  <li>{{ Cssxref("text-decoration") }}<br>
-    要素の装飾を行いません。</li>
-  <li>{{ Cssxref("max-height") }} / {{ Cssxref("max-width") }}<br>
-    高さ・幅を特定値で制限しません。</li>
-  <li>{{ Cssxref("background-image") }}</li>
-  <li>{{ Cssxref("border-style") }}</li>
-  <li>{{ Cssxref("clear") }}</li>
-  <li>{{ Cssxref("content") }}</li>
-  <li>{{ Cssxref("counter-increment") }}</li>
-  <li>{{ Cssxref("counter-reset") }}</li>
-  <li>{{ Cssxref("display") }}</li>
-  <li>{{ Cssxref("list-style-type") }}</li>
-  <li>{{ Cssxref("quotes") }}</li>
-  <li>{{ Cssxref("text-transform") }}</li>
-</ul>
-- 
cgit v1.2.3-54-g00ecf