chore: prepare sshpk for cert/key/sshkeys related tools

sharevb · sharevb · commit 60841f6e4a32 · 2024-02-18T12:31:35.000+01:00
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
     "@tiptap/pm": "2.1.6",
     "@tiptap/starter-kit": "2.1.6",
     "@tiptap/vue-3": "2.0.3",
+    "@types/sshpk": "^1.17.4",
     "@vicons/material": "^0.12.0",
     "@vicons/tabler": "^0.12.0",
     "@vueuse/core": "^10.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/vite.config.ts b/vite.config.ts
@@ -1,8 +1,5 @@
 import { resolve } from 'node:path';
-<<<<<<< HEAD
 import { URL, fileURLToPath } from 'node:url';
-=======
->>>>>>> chore: prepare sshpk for cert/key/sshkeys related tools
 import { nodePolyfills } from 'vite-plugin-node-polyfills';
 
 import VueI18n from '@intlify/unplugin-vue-i18n/vite';
