awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 07:30:20 +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/components/navigation/NavBarDashboard.tsx
+8
View File
@@ -1,10 +1,18 @@
/* eslint-disable react/jsx-key */
<<<<<<< HEAD
import React, { 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,
frontend/components/navigation/NavHeader.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useRouter } from "next/router";
import {
faAngleRight,