awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 11:29:42 +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/settings/org/[id].js
+1 -7
View File
@@ -1,13 +1,7 @@
<<<<<<< HEAD
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import Head from "next/head";
import { useRouter } from "next/router";
import { useTranslation } from "next-i18next";
=======
import { useEffect, useState } from 'react';
import Head from 'next/head';
import { useRouter } from 'next/router';
>>>>>>> 876c5f51c2caabf92b47d5a18a9b98e601806bf4
import {
faMagnifyingGlass,
faPlus,