priyatham
/
gcs-user-interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict

This commit is contained in:
Steven C 2024-03-30 23:21:44 -07:00
parent bbdf19bcb0 ce0bcf2117
commit a05e663836
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package-lock.json generated
View File

@ -11,6 +11,7 @@
"@tauri-apps/api": "^1.4.0", "@tauri-apps/api": "^1.4.0",
"vue": "^3.2.45", "vue": "^3.2.45",
"vue-router": "^4.3.0" "vue-router": "^4.3.0"
}, },
"devDependencies": { "devDependencies": {
"@tauri-apps/cli": "^1.4.0", "@tauri-apps/cli": "^1.4.0",

1
pnpm-lock.yaml
View File

@ -8914,7 +8914,6 @@ packages:
'@vue/devtools-api': 6.6.1 '@vue/devtools-api': 6.6.1
vue: 3.2.45 vue: 3.2.45
dev: false dev: false
/vue-style-loader@4.1.3: /vue-style-loader@4.1.3:
resolution: {integrity: sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==} resolution: {integrity: sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==}
dependencies: dependencies: