Resolve conflicts

vivid-planet · Jul 4, 2024 · a4b2f25 · a4b2f25
1 parent f58622a
commit a4b2f25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/packages/admin/blocks-admin/src/blocks/YouTubeVideoBlock.tsx b/packages/admin/blocks-admin/src/blocks/YouTubeVideoBlock.tsx
@@ -37,11 +37,7 @@ export const YouTubeVideoBlock: BlockInterface<YouTubeVideoBlockData, State, You
 
     displayName: <FormattedMessage id="comet.blocks.youTubeVideo" defaultMessage="Video (YouTube)" />,
 
-<<<<<<< HEAD
-    defaultValues: () => ({ youtubeIdentifier: "", autoplay: false, showControls: false, loop: false }),
-=======
-    defaultValues: () => ({ autoplay: false, showControls: false, loop: false, aspectRatio: "16X9" }),
->>>>>>> main
+    defaultValues: () => ({ autoplay: false, showControls: false, loop: false }),
 
     category: BlockCategory.Media,
 

diff --git a/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx b/packages/admin/cms-admin/src/common/header/UserHeaderItem.tsx
@@ -1,9 +1,5 @@
 import { gql, useMutation } from "@apollo/client";
-<<<<<<< HEAD
-import { AppHeaderDropdown, Loading } from "@comet/admin";
-=======
 import { AppHeaderDropdown, AppHeaderDropdownProps, Loading } from "@comet/admin";
->>>>>>> main
 import { Account, Info, Logout } from "@comet/admin-icons";
 import { Box, Button as MUIButton, useMediaQuery, useTheme } from "@mui/material";
 import { styled } from "@mui/material/styles";
@@ -53,11 +49,7 @@ export function UserHeaderItem(props: UserHeaderItemProps): React.ReactElement {
     const [signOut, { loading: isSigningOut }] = useMutation<GQLSignOutMutation>(signOutMutation);
 
     return (
-<<<<<<< HEAD
-        <AppHeaderDropdown buttonChildren={isMobile ? <Account /> : user.name} startIcon={isMobile ? undefined : <Account />}>
-=======
-        <AppHeaderDropdown buttonChildren={buttonChildren ?? user.name} startIcon={<Account />}>
->>>>>>> main
+        <AppHeaderDropdown buttonChildren={buttonChildren ?? (isMobile ? <Account /> : user.name)} startIcon={isMobile ? undefined : <Account />}>
             <DropdownContent padding={4}>
                 <Button
                     fullWidth={true}