fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>

src/components/search/GlobalSearchResults.vue

@@ -173,7 +173,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../css/variables.scss';
+@import '../../css/variables';
 
 .global-search {
 	width: 100%;