From a3fa006721d14539c80eebe88744261259bf9884 Mon Sep 17 00:00:00 2001 From: MellyGray Date: Wed, 17 Apr 2024 09:20:15 +0200 Subject: [PATCH] fix: merge conflict arrows --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index dfe7ceab4..8e2740317 100644 --- a/README.md +++ b/README.md @@ -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 -

(back to top)


-======= -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