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

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

(limited to 'files/ja/web/html')

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