From 1666cbabe7286341ac4666fed0910f703580e34a Mon Sep 17 00:00:00 2001
From: Haitao Pan <haitaopanhq@gmail.com>
Date: Tue, 30 Jun 2026 12:07:32 +0800
Subject: [PATCH] chore: resolve merge conflict in pubspec.yaml (#67)

Co-authored-by: Haitao Pan <manbuzhe2009@qq.com>