From ddad2a80d52a2d2a307a655e826f9d22654b2642 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Fri, 6 Feb 2026 21:50:08 +0800 Subject: [PATCH] chore: fix conflict typos. --- src/Directory.Build.props | 2 -- src/Semi.Avalonia/Tokens/Variables.axaml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index f607e54..2c2797f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -17,8 +17,6 @@ MIT irihi.png https://github.com/irihitech/Semi.Avalonia - 12.0.999-cibuild0058575-alpha - true README.md diff --git a/src/Semi.Avalonia/Tokens/Variables.axaml b/src/Semi.Avalonia/Tokens/Variables.axaml index efb7126..bfb141c 100644 --- a/src/Semi.Avalonia/Tokens/Variables.axaml +++ b/src/Semi.Avalonia/Tokens/Variables.axaml @@ -19,8 +19,8 @@ 0 1 1 - 3 - 3 + 3 + 3 6 12 9999