Fix merge conflicts

This commit is contained in:
Vladyslav Matsiiako
2022-12-28 13:42:27 -05:00
89 changed files with 3019 additions and 887 deletions
+4 -2
View File
@@ -1,7 +1,7 @@
import React from "react";
import Image from "next/image";
import { faFolderOpen } from "@fortawesome/free-regular-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { getTranslatedServerSideProps } from "~/utilities/withTranslateProps";
export default function NoProjects() {
return (
@@ -31,3 +31,5 @@ export default function NoProjects() {
}
NoProjects.requireAuth = true;
export const getServerSideProps = getTranslatedServerSideProps(["noprojects"]);