aboutsummaryrefslogtreecommitdiff
path: root/files/ja/web/html
diff options
context:
space:
mode:
authorMasahiro FUJIMOTO <mfujimot@gmail.com>2021-06-24 00:15:57 +0900
committerGitHub <noreply@github.com>2021-06-24 00:15:57 +0900
commit92b99c32d01fa656182d22eb5bb17ed930d67192 (patch)
treeab7ab49d4d4c9e05e4618cd95c8243d6c1849c39 /files/ja/web/html
parent64803e2c2e1e43596a08d166f3d314405a871049 (diff)
downloadtranslated-content-92b99c32d01fa656182d22eb5bb17ed930d67192.tar.gz
translated-content-92b99c32d01fa656182d22eb5bb17ed930d67192.tar.bz2
translated-content-92b99c32d01fa656182d22eb5bb17ed930d67192.zip
mdn 内にある browser-compat-data に関する非表示の指示を削除 (#1182)
Diffstat (limited to 'files/ja/web/html')
-rw-r--r--files/ja/web/html/element/figcaption/index.html4
-rw-r--r--files/ja/web/html/element/head/index.html6
2 files changed, 10 insertions, 0 deletions
diff --git a/files/ja/web/html/element/figcaption/index.html b/files/ja/web/html/element/figcaption/index.html
index 2d0b76e6e4..3aa3682217 100644
--- a/files/ja/web/html/element/figcaption/index.html
+++ b/files/ja/web/html/element/figcaption/index.html
@@ -82,8 +82,12 @@ translation_of: Web/HTML/Element/figcaption
<h2 id="Browser_compatibility">ブラウザーの互換性</h2>
+<<<<<<< Updated upstream
<p>{{Compat}}</p>
+=======
+<p>{{Compat("html.elements.figcaption")}}</p>
+>>>>>>> Stashed changes
<h2 id="See_also">関連情報</h2>
diff --git a/files/ja/web/html/element/head/index.html b/files/ja/web/html/element/head/index.html
index 03a3505295..3596c470cf 100644
--- a/files/ja/web/html/element/head/index.html
+++ b/files/ja/web/html/element/head/index.html
@@ -109,9 +109,15 @@ translation_of: Web/HTML/Element/head
</tbody>
</table>
+<<<<<<< Updated upstream
<h2 id="Browser_compatibility">ブラウザーの互換性</h2>
<p>{{Compat}}</p>
+=======
+<h2 id="Browser_compatibility" name="Browser_compatibility">ブラウザーの互換性</h2>
+
+<p>{{Compat("html.elements.head")}}</p>
+>>>>>>> Stashed changes
<h2 id="See_also">関連情報</h2>