Fix merge conflict

thorfeus2 · Feb 28, 2023 · 1e04e1d · 1e04e1d
1 parent f3bcbd3
commit 1e04e1d
Show file tree

Hide file tree

Showing 7 changed files with 1,102 additions and 1,057 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+[Unreleased]
+* When page is loaded with "s" in url parameters try to set focus to search input field
+
 ### 9.3.1: 2023-02-24
 
 * Remove nav-toggle styles not in use

diff --git a/js/dev/front-end.js b/js/dev/front-end.js