Merge feature/UI-DSC-MFA: resolve conflicts keeping both UI updates and account-charges changes
This commit is contained in:
@@ -176,6 +176,11 @@ import {
|
||||
faStamp,
|
||||
faSpinner,
|
||||
faPhone,
|
||||
faTruck,
|
||||
faTruckFast,
|
||||
faCommentDots,
|
||||
faEllipsisV,
|
||||
faEllipsisH,
|
||||
faHashtag,
|
||||
faMapMarkerAlt,
|
||||
faHourglassHalf,
|
||||
@@ -211,7 +216,10 @@ import {
|
||||
faScaleBalanced,
|
||||
faNotesMedical,
|
||||
faFileLines,
|
||||
faBuildingColumns
|
||||
faBuildingColumns,
|
||||
faRedo,
|
||||
faSignature,
|
||||
faPercentage
|
||||
} from '@fortawesome/free-solid-svg-icons';
|
||||
|
||||
/**
|
||||
@@ -394,6 +402,11 @@ export class IconsModule {
|
||||
faStamp,
|
||||
faSpinner,
|
||||
faPhone,
|
||||
faTruck,
|
||||
faTruckFast,
|
||||
faCommentDots,
|
||||
faEllipsisV,
|
||||
faEllipsisH,
|
||||
faHashtag,
|
||||
faMapMarkerAlt,
|
||||
faHourglassHalf,
|
||||
@@ -429,7 +442,10 @@ export class IconsModule {
|
||||
faScaleBalanced,
|
||||
faNotesMedical,
|
||||
faFileLines,
|
||||
faBuildingColumns
|
||||
faBuildingColumns,
|
||||
faRedo,
|
||||
faSignature,
|
||||
faPercentage
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user