From c34c436abee1ddc7558860bc7c583e8f84996239 Mon Sep 17 00:00:00 2001 From: StephDietz Date: Wed, 12 Jul 2023 10:56:17 -0500 Subject: [PATCH] tile merge --- components/grid/tile.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/grid/tile.tsx b/components/grid/tile.tsx index f267d781f..8abbc38f2 100644 --- a/components/grid/tile.tsx +++ b/components/grid/tile.tsx @@ -45,11 +45,7 @@ export function GridTileImage({ title={labels.title} amount={labels.amount} currencyCode={labels.currencyCode} -<<<<<<< HEAD size={labels.isSmall ? 'small' : 'large'} -======= - size="large" ->>>>>>> design-refresh position={labelPosition} /> ) : null}