Fixed merge conflicts

Frontend/src/components/sidebar/SidebarComponent.vue

@@ -8,24 +8,16 @@ import logoWhite from '@assets/logo_czarne.svg';
 
 const logoR11 = ref( logoDark );
 
-<<<<<<< HEAD
-=======
 const emit = defineEmits([
     'theme:changed'
 ])
 
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 
 function changeLogoForTheme(){
     logoR11.value = isDarkModeSet() ? logoDark : logoWhite;
 }
 
 function isDarkModeSet(){
-<<<<<<< HEAD
-    return window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
-}
-
-=======
     if (localStorage.theme) 
         return localStorage.theme == "dark";
     else
@@ -37,7 +29,6 @@ function changeTheme(theme:string){
             emit('theme:changed',theme);
     }
 
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 onMounted( () => {
     changeLogoForTheme();
 })
@@ -50,13 +41,8 @@ onMounted( () => {
             <a href="https://release11.com/">
                 <img :src="logoR11" class="w-72 h-16 p-2 pt-0"/>
             </a>
-<<<<<<< HEAD
-            <div class="flex basis-full flex-col font-medium items-center">
-                <sidebar-menu-element-component category-name="XML">
-=======
             <div class="flex basis-full flex-col font-normal items-center">
                 <sidebar-menu-element-component category-name="Parser">
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
                     <SidebarToolLinkComponent path-to="/xml/xpath" element-content="XPath" />
                     <SidebarToolLinkComponent path-to="/xml/xquery" element-content="XQuery" />
                     <SidebarToolLinkComponent path-to="/xml/xsd" element-content="XSD" />
@@ -74,10 +60,6 @@ onMounted( () => {
                     <SidebarToolLinkComponent path-to="/rest/mock" element-content="Mock" />
                 </sidebar-menu-element-component>
 
-<<<<<<< HEAD
-            </div>
-            <FooterComponent></FooterComponent>
-=======
                 <sidebar-menu-element-component category-name="Encoder">
                     <SidebarToolLinkComponent path-to="/encoder/base64" element-content="Base64" />
                     <SidebarToolLinkComponent path-to="/encoder/url" element-content="URL" />
@@ -86,7 +68,6 @@ onMounted( () => {
 
             </div>
             <FooterComponent @theme="changeTheme"></FooterComponent>
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
         </div>
     </aside>
 </template>