awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-12 02:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing merge conflicts for pages/users

Browse Source
This commit is contained in:
Vladyslav Matsiiako
2022-12-27 18:19:56 -05:00
parent f6faad267c 876c5f51c2
commit cbb99844f1
120 changed files with 3842 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/pages/verify-email.tsx
+7
View File
@@ -1,7 +1,14 @@
<<<<<<< HEAD
import React, { useState } from "react";
import Head from "next/head";
import Image from "next/image";
import Link from "next/link";
=======
import { useState } from 'react';
import Head from 'next/head';
import Image from 'next/image';
import Link from 'next/link';
>>>>>>> 876c5f51c2caabf92b47d5a18a9b98e601806bf4
import Button from "~/components/basic/buttons/Button";
import InputField from "~/components/basic/InputField";