fix conflicts

StartUpNationLabs · Sep 21, 2024 · 1b59815 · 1b59815
1 parent 6c726c4
commit 1b59815
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/libs/ui/common/src/index.ts b/libs/ui/common/src/index.ts
@@ -3,8 +3,5 @@ export * from './lib/tables/landingPage';
 export * from './lib/offers/offers';
 export * from './lib/orders/orders';
 export * from './lib/summary/summary';
-<<<<<<< HEAD
 export * from './lib/groupBillingPage/groupBillingPage';
-=======
 export * from './lib/utils/navbar';
->>>>>>> navbar
diff --git a/libs/ui/common/src/lib/orders/orders.tsx b/libs/ui/common/src/lib/orders/orders.tsx
@@ -57,19 +57,11 @@ export function Orders() {
                                 fontWeight="bold"
                                 style={{ color: 'black' }}>
                         Orders
-<<<<<<< HEAD
-                    </Button>
-
-                    <Box sx={{
-                        display: 'flex',
-                        flexDirection: 'column',
-=======
                     </Typography>
 
                     <Box sx={{ 
                         display: 'flex', 
                         flexDirection: 'column', 
->>>>>>> navbar
                         alignItems: 'flex-start',
                         mt: 4,
                         pl: 0,