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