コンフリクト解消, node 24 に更新, メジャーバージョン固定

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: aster-void

README.md

@@ -37,18 +37,8 @@ shebang は `#!/usr/bin/env -S mise exec -- bash` にする。mise がランタ
 
 ```yaml
 my-bot:
-<<<<<<< Updated upstream
-  schedule: "7pm" # 下記参照
-  working_dir: bots/my-bot
-  run: ./run.sh
-||||||| Stash base
-  schedule: "7pm"  # 下記参照
-  working_dir: bots/my-bot
-  run: ./run.sh
-=======
   schedule: "7pm"  # 下記参照
   run: bots/my-bot/run.sh
->>>>>>> Stashed changes
   log: ~/run/discord-bots/my-bot/log
   # build: ./build.sh  # コンパイルが必要な場合
   # env_file: ~/run/discord-bots/my-bot/env  # 環境変数が必要な場合
@@ -111,12 +101,7 @@ sops を使わない場合:
 ## コマンド
 
 ```bash
-<<<<<<< Updated upstream
-||||||| Stash base
-eval "$(direnv export bash)" && COMMAND
-=======
 mise exec -- COMMAND
->>>>>>> Stashed changes
 sops exec-env path/to/sops.env 'echo success!' # sops 鍵検証
 ssh USER@coolify.utcode.net "sudo -u deploy bash -c 'COMMAND'" # デプロイ先で操作
 ```

mise.toml

@@ -1,9 +1,9 @@
 [tools]
-bun = "latest"
-node = "22"
-biome = "latest"
-sops = "latest"
-age = "latest"
+bun = "1"
+node = "24"
+biome = "2"
+sops = "3"
+age = "1"
 
 [env]
 SOPS_AGE_KEY_FILE = "{{ config_root }}/.age-key"

rollcron.yaml

@@ -29,25 +29,9 @@ jobs:
     env_file: ~/run/discord-bots/asakatsu-bot/env
     log: ~/run/discord-bots/asakatsu-bot/log
 
-<<<<<<< Updated upstream
   # joji-bot:
   #   schedule: "7pm"
-  #   working_dir: bots/joji-bot
-  #   run: ./run.sh
+  #   run: bots/joji-bot/run.sh
   #   env_file: ~/run/discord-bots/joji-bot/env
   #   log: ~/run/discord-bots/joji-bot/log
-||||||| Stash base
-  joji-bot:
-    schedule: "7pm"
-    working_dir: bots/joji-bot
-    run: ./run.sh
-    env_file: ~/run/discord-bots/joji-bot/env
-    log: ~/run/discord-bots/joji-bot/log
-=======
-  joji-bot:
-    schedule: "7pm"
-    run: bots/joji-bot/run.sh
-    env_file: ~/run/discord-bots/joji-bot/env
-    log: ~/run/discord-bots/joji-bot/log
->>>>>>> Stashed changes