Skip to content

Commit

Permalink
fix: merge conflict arrows
Browse files Browse the repository at this point in the history
  • Loading branch information
MellyGray committed Apr 17, 2024
1 parent f89980a commit a3fa006
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,8 @@ features (and known issues), and what we are working on in the [currently planne
Keep an eye out on [The Institute for Quantitative Social Science (IQSS) Dataverse Roadmap][hvd_iqss_roadmap_url] at
Harvard University to get a look at upcoming initiatives for the project.

<<<<<<< HEAD

<p align="right">(<a href="#readme-top">back to top</a>)</p>
<br>
=======
We have introduced an update to the breadcrumb navigation UI. Unlike in the original JSF application, where breadcrumbs
did not reflect the user's current location within the site, our new SPA design now includes this feature in the breadcrumbs.
Additionally, we have aligned with best practices by positioning all breadcrumbs at the top, before anything else in the UI.
>>>>>>> 3aa4685da974fdc9328c44866237bd8173e31cda

## Contributing

Expand Down

0 comments on commit a3fa006

Please sign in to comment.