不要文字削除

y-yamasaki · y-yamasaki · commit 0a6232ce0617 · 2025-11-13T15:49:24.000+09:00
diff --git a/contact.html b/contact.html
@@ -20,8 +20,6 @@
             rel="stylesheet"
             href="assets/css/contact.css"
         />
-<<<<<<< HEAD
-=======
 
         <meta
             name="description"
@@ -62,7 +60,6 @@
             name="twitter:image"
             content="https://breadmotion.github.io/WebSite/assets/ogp.png"
         />
->>>>>>> develop
     </head>
     <body>
         <!-- header は layout.js が自動挿入 -->
diff --git a/index.html b/index.html
@@ -26,8 +26,6 @@
             href="assets/css/top.css"
             class="active"
         />
-<<<<<<< HEAD
-=======
 
         <meta
             name="description"
@@ -68,7 +66,6 @@
             name="twitter:image"
             content="https://breadmotion.github.io/WebSite/assets/ogp.png"
         />
->>>>>>> develop
     </head>
     <body>
         <!-- header は layout.js が自動挿入 -->
diff --git a/portfolio.html b/portfolio.html
@@ -20,8 +20,6 @@
             rel="stylesheet"
             href="assets/css/portfolio.css"
         />
-<<<<<<< HEAD
-=======
 
         <meta
             name="description"
@@ -62,7 +60,6 @@
             name="twitter:image"
             content="https://breadmotion.github.io/WebSite/assets/ogp.png"
         />
->>>>>>> develop
     </head>
     <body>
         <!-- header は layout.js が自動挿入 -->
