merge conflicts

This commit is contained in:
amirrezaghabeli
2025-09-27 13:39:36 +03:30
parent 206553735e
commit ebcce6b9f8
6 changed files with 128 additions and 91 deletions
+1
View File
@@ -181,4 +181,5 @@ class AppColors {
static const Color yellow4 = Color(0xFFC07A25);
static const Color secondaryborder = Color(0xFFCDCDCD);
static const Color secondaryborder2 = Color(0xFFDADADA);
static const Color orange20 = Color(0xFFF6D7AB);
}