diff options
| author | hiro <hiro0218@gmail.com> | 2021-09-25 12:01:35 +0900 |
|---|---|---|
| committer | Masahiro FUJIMOTO <mfujimot@gmail.com> | 2021-09-25 12:37:29 +0900 |
| commit | e932a500a10b4e947ea1f30e8f6b734ae6b9822f (patch) | |
| tree | cb862a94bbbc036c4c1d64b864191a65fe6cb463 /files/ja/web/html | |
| parent | 7e3f77a5079cef874509f7c807c54548750b2b80 (diff) | |
| download | translated-content-e932a500a10b4e947ea1f30e8f6b734ae6b9822f.tar.gz translated-content-e932a500a10b4e947ea1f30e8f6b734ae6b9822f.tar.bz2 translated-content-e932a500a10b4e947ea1f30e8f6b734ae6b9822f.zip | |
fix: コンフリクト解消ミスを修正
Diffstat (limited to 'files/ja/web/html')
| -rw-r--r-- | files/ja/web/html/element/head/index.html | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/files/ja/web/html/element/head/index.html b/files/ja/web/html/element/head/index.html index 3596c470cf..03a3505295 100644 --- a/files/ja/web/html/element/head/index.html +++ b/files/ja/web/html/element/head/index.html @@ -109,15 +109,9 @@ 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> |