Skip to content

Commit 6c2fa9d

Browse files
Fix linting
1 parent 25b2877 commit 6c2fa9d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

pages/skill-tree/index.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,15 +283,11 @@ export default {
283283
onclickUploadCertificates,
284284
ArrowUpTrayIcon,
285285
breadcrumbs,
286-
<<<<<<< Updated upstream
287-
=======
288-
289286
xp,
290287
291288
searchDialog,
292289
openSearchDialog,
293290
closeSearchDialog,
294-
>>>>>>> Stashed changes
295291
};
296292
},
297293
};

0 commit comments

Comments
 (0)