Fix conflicts

yasulab · yasulab · commit 1d219487b3aa · 2025-10-03T21:59:11.000+09:00
diff --git a/index.html b/index.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-
-<html lang="ja" dir="ltr">
+<html lang="ja">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0">
diff --git a/site.webmanifest b/site.webmanifest
@@ -1,7 +1,6 @@
 {
-<<<<<<< HEAD
-  "name": "DojoCon Japan 2025",
-  "short_name": "DojoCon Japan 2025",
+  "name": "Coolest Projects Japan 2026",
+  "short_name": "Coolest Projects Japan 2026",
   "icons": [
     {
       "src": "/img/android-chrome-192x192.png",
@@ -17,23 +16,4 @@
   "theme_color": "#ffffff",
   "background_color": "#ffffff",
   "display": "standalone"
-=======
-  "name":       "DojoCon Japan",
-  "short_name": "DojoCon Japan",
-  "icons": [
-    {
-      "src":   "/img/android-chrome-192x192.png",
-      "sizes": "192x192",
-      "type":  "image/png"
-    },
-    {
-      "src":   "/img/android-chrome-256x256.png",
-      "sizes": "256x256",
-      "type":  "image/png"
-    }
-  ],
-  "theme_color":      "#ffffff",
-  "background_color": "#ffffff",
-  "display":          "standalone"
->>>>>>> b8a451b (Initial commit)
 }
diff --git a/sitemap.xml b/sitemap.xml
@@ -3,10 +3,6 @@
 	xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
 	xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
-<<<<<<< HEAD
-    <loc>https://dojocon2025.coderdojo.jp/</loc>
-=======
-    <loc>https://dojocon-template.coderdojo.jp/</loc>
->>>>>>> b8a451b (Initial commit)
+    <loc>https://coolestprojects2026.coderdojo.jp/</loc>
   </url>
 </urlset>
