Fixing more merge conflicts

Infisical · Dec 27, 2022 · 1459370 · 1459370
1 parent cbb9984
commit 1459370
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 879 deletions.
diff --git a/frontend/components/dashboard/DropZone.tsx b/frontend/components/dashboard/DropZone.tsx
@@ -152,13 +152,7 @@ const DropZone = ({
           icon={faUpload}
           className="text-bunker-300 text-3xl mr-6"
         />
-<<<<<<< HEAD
         <p className="text-bunker-300 mt-1">{t("common:drop-zone-keys")}</p>
-=======
-        <p className="text-bunker-300 mt-1">
-          Drag and drop your .env file here to add more keys.
-        </p>
->>>>>>> 876c5f51c2caabf92b47d5a18a9b98e601806bf4
       </div>
       {errorDragAndDrop ? (
         <div className="mt-8 max-w-xl opacity-80">

diff --git a/frontend/components/navigation/NavBarDashboard.tsx b/frontend/components/navigation/NavBarDashboard.tsx
@@ -1,18 +1,10 @@
 /* eslint-disable react/jsx-key */
-<<<<<<< HEAD
-import React, { Fragment, useEffect, useMemo, useState } from "react";
+import { Fragment, useEffect, useMemo, useState } from "react";
 import Image from "next/image";
 import { useRouter } from "next/router";
 import { TFunction, useTranslation } from "next-i18next";
 import { faGithub, faSlack } from "@fortawesome/free-brands-svg-icons";
 import { faCircleQuestion } from "@fortawesome/free-regular-svg-icons";
-=======
-import { Fragment, useEffect, useState } from 'react';
-import Image from 'next/image';
-import { useRouter } from 'next/router';
-import { faGithub, faSlack } from '@fortawesome/free-brands-svg-icons';
-import { faCircleQuestion } from '@fortawesome/free-regular-svg-icons';
->>>>>>> 876c5f51c2caabf92b47d5a18a9b98e601806bf4
 import {
   faAngleDown,
   faBook,