fix(merge)
Resolved merge conflict
Showing
- src/App.vue 2 additions, 1 deletionsrc/App.vue
- src/assets/bioAuthFace.png 0 additions, 0 deletionssrc/assets/bioAuthFace.png
- src/assets/bioAuthTouch.png 0 additions, 0 deletionssrc/assets/bioAuthTouch.png
- src/components/FormLogin.vue 77 additions, 29 deletionssrc/components/FormLogin.vue
- src/components/ImgGifTemplate.vue 18 additions, 0 deletionssrc/components/ImgGifTemplate.vue
- src/components/SavingsPath.vue 77 additions, 102 deletionssrc/components/SavingsPath.vue
- src/components/__tests__/NavBarTest.spec.ts 1 addition, 1 deletionsrc/components/__tests__/NavBarTest.spec.ts
- src/components/__tests__/savingsPathTest.spec.ts 1 addition, 1 deletionsrc/components/__tests__/savingsPathTest.spec.ts
- src/router/index.ts 15 additions, 0 deletionssrc/router/index.ts
- src/stores/accountStore.ts 35 additions, 0 deletionssrc/stores/accountStore.ts
- src/stores/userConfigStore.ts 20 additions, 13 deletionssrc/stores/userConfigStore.ts
- src/stores/userStore.ts 139 additions, 1 deletionsrc/stores/userStore.ts
- src/types/CredentialCreationOptions.ts 3 additions, 0 deletionssrc/types/CredentialCreationOptions.ts
- src/types/CredentialRequestOptions.ts 3 additions, 0 deletionssrc/types/CredentialRequestOptions.ts
- src/types/profile.ts 19 additions, 0 deletionssrc/types/profile.ts
- src/util.ts 33 additions, 0 deletionssrc/util.ts
- src/utilo.js 28 additions, 0 deletionssrc/utilo.js
- src/views/AddAlternativeLogin.vue 48 additions, 0 deletionssrc/views/AddAlternativeLogin.vue
- src/views/CardTemplate.vue 9 additions, 0 deletionssrc/views/CardTemplate.vue
- src/views/ConfigAccountNumberView.vue 114 additions, 0 deletionssrc/views/ConfigAccountNumberView.vue
Loading
Please register or sign in to comment