Raj.Shinde/Traders_Circuit
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict resolve

Browse Source
This commit is contained in:
priyanka
2024-03-21 00:17:38 -07:00
parent e2f0f6bfbe 9a3ee57750
commit fef06e00ed
21 changed files with 1222 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Utils/text.dart
View File

@@ -231,23 +231,34 @@ Widget text14W300(String text) {
);
}
<<<<<<< HEAD
Widget text14W400(String text) {
return Text(
=======
Widget text14W400(String text) { return Text(
>>>>>>> 9a3ee57750db74808606d8117676461f7d75fd06
text,
style: TextStyle(
fontSize: 14.sp,
color: Colors.white,
<<<<<<< HEAD
=======
>>>>>>> 9a3ee57750db74808606d8117676461f7d75fd06
fontWeight: FontWeight.w400,
fontFamily: 'manrope'),
);
}
Widget text14W500(String text) {
return Text(
text,
style: TextStyle(
fontSize: 14.sp,
color: Colors.white,
fontWeight: FontWeight.w500,
fontFamily: 'manrope'),
);
@@ -259,11 +270,13 @@ Widget text16W400_DADADA(String text) {
style: TextStyle(
fontSize: 16.sp,
color: Color(0xFFDADADA),
fontWeight: FontWeight.w400,
fontFamily: 'manrope'),
);
}
Widget text14W400_979797(String text) {
return Text(
text,
@@ -307,3 +320,4 @@ Widget text14W500_black(String text) {
fontFamily: 'manrope'),
);
}