Skip to content

Commit

Permalink
[Git Merge] Removed remnants of merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
chunzkok committed Jul 17, 2022
1 parent 776d080 commit 3311b4a
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions src/Routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ const ProjectRoutes = ({ setToastOptions }) => {
isBanned={isBanned}
showSimpleToast={showSimpleToast}
setToastOptions={setToastOptions}
option={option}
setOption={setOption}
/>
</Router>
</LoadingOverlay>
Expand All @@ -71,13 +69,7 @@ const ProjectRoutes = ({ setToastOptions }) => {

export default ProjectRoutes;

const AnimatedRoutes = ({
isBanned,
showSimpleToast,
setToastOptions,
option,
setOption,
}) => {
const AnimatedRoutes = ({ isBanned, showSimpleToast, setToastOptions }) => {
// Add TransitionGroup and CSSTransition for animations
return !isBanned ? (
<Routes>
Expand Down

0 comments on commit 3311b4a

Please sign in to comment.