fixed conflicts

This commit is contained in:
amirrezaghabeli
2025-09-13 12:31:08 +03:30
parent d065316113
commit 5a9d93cdd6
7 changed files with 319 additions and 73 deletions
+6 -6
View File
@@ -12,9 +12,9 @@ class AssetsManager {
static const tendersActive = 'assets/icons/task-square_active.svg';
static const profile = 'assets/icons/profile-circle.svg';
static const profileActive = 'assets/icons/profile-circle_active.svg';
static const contracts = 'assets/icons/icon_contracts.svg';
static const notify = 'assets/icons/notify_icon.svg';
static const notifyActive = 'assets/icons/notify_icon_active.svg';
static const contracts = 'assets/icons/icon_contracts.svg';
static const notify = 'assets/icons/notify_icon.svg';
static const notifyActive = 'assets/icons/notify_icon_active.svg';
// login page
static const logo = 'assets/pngs/logo.png';
@@ -65,7 +65,7 @@ class AssetsManager {
static const moon = 'assets/icons/moon.svg';
//Liked tenders
static const trash = 'assets/icons/trash.svg';
static const arrowDownSmall = 'assets/icons/arrow_down_small.svg';
static const trash = 'assets/icons/trash.svg';
static const arrowDownSmall = 'assets/icons/arrow_down_small.svg';
static const filter = 'assets/icons/filter.svg';
}