Fix merge conflicts

src/modules/project/ProjectModule.vue

@@ -90,14 +90,7 @@ export default defineComponent({
       ) {
         this.projectStore.retrieveInvitations(this.project);
       }
-<<<<<<< HEAD
-      // Load list of Enabled Resource Types if not present
-      if (this.resourceStore.enabledResourceTypes === null) {
-        await this.resourceStore.retrieveResourceTypes();
-      }
-=======
       await this.resourceStore.retrieveEnabledResourceTypes(this.project);
->>>>>>> main
     },
   },
 });

src/modules/resource/pages/CreateResource.vue

@@ -195,11 +195,7 @@ export default defineComponent({
       }
       // Load list of Enabled Resource Types if not present
       if (this.resourceStore.enabledResourceTypes === null) {
-<<<<<<< HEAD
-        await this.resourceStore.retrieveResourceTypes();
-=======
         await this.resourceStore.retrieveEnabledResourceTypes(this.project);
->>>>>>> main
       }
       // Load Project Visibilities if not present
       if (this.projectStore.visibilities === null) {

src/modules/resource/store.ts

@@ -21,7 +21,6 @@ import type {
   Project,
   ResourceObject,
   ResourceQuotaReturnObject,
-  ResourceTypeInformation,
 } from "@coscine/api-client/dist/types/Coscine.Api.Resources";
 import type { Route } from "vue-router/types/router";
 import type { BilingualLabels } from "@coscine/api-client/dist/types/Coscine.Api.Metadata";
@@ -90,14 +89,6 @@ export const useResourceStore = defineStore({
       }
     },
 
-<<<<<<< HEAD
-    enabledResourceTypes(): ResourceTypeInformation[] | null {
-      if (this.resourceTypes) {
-        return this.resourceTypes.filter((rt) => rt.isEnabled);
-      } else {
-        return null;
-      }
-=======
     currentStoredColumns(): StoredColumnValues | null {
       if (this.currentId && this.currentResource) {
         if (this.currentResource.storedColumns) {
@@ -105,7 +96,6 @@ export const useResourceStore = defineStore({
         }
       }
       return null;
->>>>>>> main
     },
   },
   /*  

src/modules/search/SearchModule.vue

@@ -41,12 +41,8 @@ export default defineComponent({
       if (!this.resourceStore.allResources) {
         await this.resourceStore.retrieveAllResources();
       }
-<<<<<<< HEAD
-      if (!this.resourceStore.enabledResourceTypes) {
-=======
       // Load list of all Resource Types if not present
       if (!this.resourceStore.resourceTypes) {
->>>>>>> main
         await this.resourceStore.retrieveResourceTypes();
       }
     },