diff options
Diffstat (limited to 'files/ja/web')
| -rw-r--r-- | files/ja/web/html/element/figcaption/index.html | 4 | ||||
| -rw-r--r-- | files/ja/web/html/element/head/index.html | 6 |
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> |