Fixing more merge conflicts

2026-10-14 16:40:30 +00:00 · 2022-12-27 18:22:48 -05:00
parent cbb99844f1
commit 1459370458
9 changed files with 6 additions and 879 deletions
@@ -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">