no overriding of link classes needed

sul-dlss · Dec 18, 2024 · b282109 · b282109
1 parent 8bfb621
commit b282109
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/app/components/skip_link_component.html.erb b/app/components/skip_link_component.html.erb
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
 <nav id="skip" class="visually-hidden-focusable" aria-label="<%= t('blacklight.skip_links.label') %>">
     <%= link_to_main %>
     <%= link_to_search %>
     <%= content %>
-</nav>
-=======
-<nav id="skip" aria-label="<%= t('blacklight.skip_links.label') %>">
-    <%= link_to_main %>
-    <%= link_to_search %>
-    <%= content %>
-</nav>
->>>>>>> 8ffccd0e (reverting)
+</nav>
diff --git a/app/components/skip_link_component → app/components/skip_link_component.rb b/app/components/skip_link_component → app/components/skip_link_component.rb