Skip to content

Commit

Permalink
Updated header
Browse files Browse the repository at this point in the history
  • Loading branch information
courtneyc1 committed Sep 13, 2023
1 parent ea51441 commit d927fb0
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions frontend/src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,12 @@ const HeaderNoCtx: React.FC<ContextType> = (props) => {
exact: false
},
{ title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false },
<<<<<<< Updated upstream

Check notice

Code scanning / CodeQL

Syntax error Note

Error: Merge conflict marker encountered.
/* {
=======
{
>>>>>>> Stashed changes
title: 'Reports',
path: '/reports',
users: ALL_USERS,
Expand Down

0 comments on commit d927fb0

Please sign in to comment.