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

Fix merge conflicts

Browse Source
This commit is contained in:
Tuan Dang
2022-12-27 09:34:07 -05:00
parent 009f9c6842 f550e4bc87
commit 019e90dc77
196 changed files with 8025 additions and 2831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/components/basic/table/ServiceTokenTable.js
+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 { faX } from '@fortawesome/free-solid-svg-icons';
frontend/components/basic/table/UserTable.js
+1 -1
View File
@@ -1,4 +1,4 @@
import React, { useEffect, useMemo, useState } from 'react';
import { useEffect, useMemo, useState } from 'react';
import { useRouter } from 'next/router';
import { faX } from '@fortawesome/free-solid-svg-icons';