awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 17:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing more merge conflicts

Browse Source
This commit is contained in:
Vladyslav Matsiiako
2022-12-27 18:22:48 -05:00
parent cbb99844f1
commit 1459370458
9 changed files with 6 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/pages/password-reset.tsx
+1 -9
View File
@@ -1,16 +1,8 @@
<<<<<<< HEAD
import React, { useState } from "react";
import { useState } from "react";
import Image from "next/image";
import { useRouter } from "next/router";
import { faCheck, faX } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
=======
import { useState } from 'react';
import Image from 'next/image';
import { useRouter } from 'next/router';
import { faCheck, faX } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
>>>>>>> 876c5f51c2caabf92b47d5a18a9b98e601806bf4
import Button from "~/components/basic/buttons/Button";
import InputField from "~/components/basic/InputField";