From 18c70e409c4fb40df09830677c76fe8b6db3369f Mon Sep 17 00:00:00 2001
From: hiro <hiro0218@gmail.com>
Date: Sat, 25 Sep 2021 12:04:12 +0900
Subject: fix: コンフリクト解消ミスを修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/ja/web/html/element/figcaption/index.html | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'files')

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>
 
-- 
cgit v1.2.3-54-g00ecf