peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-01-17 10:47:45 +01:00
parent d2478bf311 55b1f4c3ba
commit 50f2fd39a2
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/profile/profile.page.ts
+3 -3
View File
@@ -78,9 +78,9 @@ export class ProfilePage implements OnInit {
async getNotificationData() {
const keyExist = await this.storageservice.keyExist("Notifications")
//const keyExist = await this.storageservice.keyExist("Notifications")
if(keyExist) {
//if(keyExist) {
this.storageservice.get("Notifications").then((value) => {
this.DataArray = []
@@ -126,7 +126,7 @@ export class ProfilePage implements OnInit {
}).catch((error) => {
console.error('storage getnotification: ',error)
})
}
// }
}
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "3262b6a3a",
"SHA": "3262b6a3a7f3d37ee463dbc825193de1ab46cabd",
"shortSHA": "d2478bf31",
"SHA": "d2478bf311a985605138bfe510f5d2c64a7950a9",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Jan 16 15:47:18 2023 +0100'",
"lastCommitMessage": "merge",
"lastCommitNumber": "4630",
"lastCommitTime": "'Tue Jan 17 10:45:20 2023 +0100'",
"lastCommitMessage": "return icons",
"lastCommitNumber": "4631",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/inactivity/inactivity.page.html\n\tmodified: src/app/pages/login/login.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/environments/environment.ts\n\tmodified: src/index.html\n\tmodified: src/main.ts",
"changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}