fix: merge conflicts

This commit is contained in:
sriram veeraghanta
2025-04-09 15:10:45 +05:30
parent a794c44cd8
commit 31a36922cd
@@ -15,7 +15,7 @@ import { convertHexEmojiToDecimal } from "@/helpers/emoji.helper";
import { getFileURL } from "@/helpers/file.helper";
import { getTabIndex } from "@/helpers/tab-indices.helper";
// plane web imports
import { ProjectTemplateSelect } from "@/plane-web/components/projects/create/template-select";
// import { ProjectTemplateSelect } from "@/plane-web/components/projects/create/template-select";
type Props = {
handleClose: () => void;
@@ -41,9 +41,9 @@ const ProjectCreateHeader: React.FC<Props> = (props) => {
/>
)}
<div className="absolute left-2.5 top-2.5">
{/* <div className="absolute left-2.5 top-2.5">
<ProjectTemplateSelect handleModalClose={handleClose} />
</div>
</div> */}
<div className="absolute right-2 top-2 p-2">
<button data-posthog="PROJECT_MODAL_CLOSE" type="button" onClick={handleClose} tabIndex={getIndex("close")}>
<X className="h-5 w-5 text-white" />