Address merge conflicts

This commit is contained in:
Tuan Dang
2024-04-04 10:01:19 -07:00
227 changed files with 6225 additions and 1804 deletions
@@ -34,15 +34,7 @@ export const MembersPage = withProjectPermission(
<Tab value={TabSections.Roles}>Project Roles</Tab>
</TabList>
<TabPanel value={TabSections.Member}>
<motion.div
key="panel-1"
transition={{ duration: 0.15 }}
initial={{ opacity: 0, translateX: 30 }}
animate={{ opacity: 1, translateX: 0 }}
exit={{ opacity: 0, translateX: 30 }}
>
<MemberListTab />
</motion.div>
<MemberListTab />
</TabPanel>
<TabPanel value={TabSections.Groups}>
<motion.div