aboutsummaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
Diffstat (limited to 'files')
-rw-r--r--files/ja/web/html/element/figcaption/index.html5
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>