[INJI-725]: Resolved merge conflicts in PR

Signed-off-by: anil_majji <majjianilkumar050@gmail.com>
This commit is contained in:
anil_majji
2024-01-23 14:12:41 +05:30
parent 07815ff8b6
commit f85c189708

View File

@@ -38,6 +38,7 @@ export class SvgImage {
const {width, height} = props;
return <Logo width={width} height={height} />;
}
static home(focused: boolean) {
//NOTE: Here tab icons names should be same with key "name" in main.ts
return (
@@ -51,6 +52,7 @@ export class SvgImage {
/>
);
}
static share(focused: boolean) {
//NOTE: Here tab icons names should be same with key "name" in main.ts
return (
@@ -64,6 +66,7 @@ export class SvgImage {
/>
);
}
static history(focused: boolean) {
//NOTE: Here tab icons names should be same with key "name" in main.ts
return (