Fix merge conflicts

This commit is contained in:
Tuan Dang
2023-10-04 10:39:50 +01:00
5 changed files with 116 additions and 7 deletions
@@ -144,7 +144,7 @@ export default function NavHeader({
href={{ pathname: "/project/[id]/secrets/[env]", query }}
>
<a className="text-sm font-semibold text-primary/80 hover:text-primary">
folderName
{folderName}
</a>
</Link>
)}