Fixing merge conflicts for pages/users

2026-10-14 19:44:52 +00:00 · 2022-12-27 18:19:56 -05:00
parent f6faad267c 876c5f51c2
commit cbb99844f1
120 changed files with 3842 additions and 399 deletions
@@ -1,7 +1,13 @@
+<<<<<<< HEAD
 import React, { 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,