resolve conflicts
This commit is contained in:
commit
ceb168a5b2
15 files changed
+27
-38
No files matched your search
@@ -1,8 +1,8 @@
|
||||
import { useContext } from "react";
|
||||
import styles from "./AdminPage.module.css";
|
||||
import IncompleteEvents from "./components/IncompleteEvent/IncompleteEvent.jsx";
|
||||
import PendingMembers from "./components/PendingMembers/PendingMembers.jsx";
|
||||
import { AuthContext } from "../../contexts/Auth/AuthContext.js";
|
||||
import IncompleteEvents from "./components/IncompleteEvent/IncompleteEvent";
|
||||
import PendingMembers from "./components/PendingMembers/PendingMembers";
|
||||
import { AuthContext } from "../../contexts/Auth/AuthContext";
|
||||
import { useNavigate } from "react-router";
|
||||
import RegisterMember from "./components/RegisterMember/RegisterMember";
|
||||
|
||||
|
||||
Reference in new issue
Block a user