no message

src/api/06_retirement/api.retirement.ts

@@ -3,17 +3,13 @@ const retirement = `${env.API_URI}/retirement`
 
 
 export default {
-<<<<<<< HEAD
-    retirement:(type:string,year:number) => `${retirement}/${type}/${year}`
-=======
     profile: (type: string, year: number) => `${retirement}/profile/${type}/${year}`,
     profileRetire: (retireId: string) => `${retirement}/profile/${retireId}`,
     getprofileRetire: (retireId: string) => `${retirement}/${retireId}`,
     createnote: () => `${retirement}/reason/`,
     reasonId: (retireId:string) => `${retirement}/reason/${retireId}`,
-    retirement:(type:string) => `${retirement}/${type}/2023`
+    retirement:(type:string,year:number) => `${retirement}/${type}/${year}`
     
 
 
->>>>>>> develop
 };

src/modules/06_retirement/views/Main.vue

@@ -37,7 +37,7 @@
             :outlined="true"
             :hide-dropdown-icon="false"
             style="min-width: 150px"
-            @update:model-value="searchFilterTable"
+
           />
           <div>
             <q-btn