fix(#0001): restore files incorrectly resolved during rebase - #14
Closed
hectorguillen-blip wants to merge 15 commits into
Closed
fix(#0001): restore files incorrectly resolved during rebase#14hectorguillen-blip wants to merge 15 commits into
hectorguillen-blip wants to merge 15 commits into
Conversation
…em units, User interface, global variables
jomcarvajal
reviewed
Apr 1, 2026
| @@ -1,11 +1,17 @@ | |||
| import { Injectable } from '@angular/core'; | |||
| <<<<<<< fix/users-list-patch | |||
jomcarvajal
reviewed
Apr 1, 2026
| <<<<<<< fix/users-list-patch | ||
| ======= | ||
| import { HttpClient } from '@angular/common/http'; | ||
| >>>>>>> 7369-admin-angular-upgrade |
jomcarvajal
reviewed
Apr 1, 2026
| private dataContext!: DataContext; | ||
|
|
||
| constructor( | ||
| <<<<<<< fix/users-list-patch |
There was a problem hiding this comment.
None of this markers should be in the code
jomcarvajal
reviewed
Apr 1, 2026
|
|
||
| it('should return false when user has none of the permissions in any group', async () => { | ||
| sessionService.userCtx.returns({ roles: ['district_admin'] }); | ||
| <<<<<<< fix/users-list-patch |
There was a problem hiding this comment.
Just choose with changes you're gonna keep but please remove all this thing. This should be showing an error when compiling because this is not a comment
jomcarvajal
reviewed
Apr 1, 2026
| can_backup_people: ['national_admin'], | ||
| }, | ||
| }); | ||
| ======= |
There was a problem hiding this comment.
Just leave the new lines and remove the indicators
hectorguillen-blip
force-pushed
the
fix/users-list-patch
branch
from
April 1, 2026 15:04
78642a5 to
bbd9954
Compare
jomcarvajal
requested changes
Apr 1, 2026
jomcarvajal
left a comment
jomcarvajal
left a comment
There was a problem hiding this comment.
Be careful next time you upload this kind of thing. Merge conflicts indicators shouldn't be here under any circumstances
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix(#1): restore auth.service.spec.ts and cht-datasource.service.ts after rebase conflict
During the rebase onto 7369-admin-angular-upgrade, two files were incorrectly resolved,
leaving older versions in place:
This patch restores the correct versions of both files.