diff options
| author | hiro <hiro0218@gmail.com> | 2021-09-25 12:04:12 +0900 |
|---|---|---|
| committer | Masahiro FUJIMOTO <mfujimot@gmail.com> | 2021-09-25 12:37:29 +0900 |
| commit | 18c70e409c4fb40df09830677c76fe8b6db3369f (patch) | |
| tree | 7ba7a805ca67374bb88677921f1650c7996d3dea /files | |
| parent | e932a500a10b4e947ea1f30e8f6b734ae6b9822f (diff) | |
| download | translated-content-18c70e409c4fb40df09830677c76fe8b6db3369f.tar.gz translated-content-18c70e409c4fb40df09830677c76fe8b6db3369f.tar.bz2 translated-content-18c70e409c4fb40df09830677c76fe8b6db3369f.zip | |
fix: コンフリクト解消ミスを修正
Diffstat (limited to 'files')
| -rw-r--r-- | files/ja/web/html/element/figcaption/index.html | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/files/ja/web/html/element/figcaption/index.html b/files/ja/web/html/element/figcaption/index.html index 3aa3682217..57c39c6f3f 100644 --- a/files/ja/web/html/element/figcaption/index.html +++ b/files/ja/web/html/element/figcaption/index.html @@ -82,12 +82,7 @@ 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> |