Merge conflict resolution related to DES-2131 #105
Merged
Conversation
This file contains 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
* Disable or remove project delete buttons If user can't delete, then hide/disable the button * Improve warning message
nathanfranklin
commented
Sep 8, 2022
angular/src/app/components/main-welcome/main-welcome.component.ts
Outdated
Show resolved
Hide resolved
duckonomy
added a commit
that referenced
this pull request
Mar 2, 2023
* Fix linting and testing and add github ci. * Update README for linting instructions. * Fix jwt.js. * Fix test config. * Add custom launcher for karma. * Add custom launcher for karma. * Update for test * Add new start npm script instructions for to README. * Adjust workflow to use angular folder (#102) * Merge conflict resolution related to DES-2131 (#105) * Task/DES-1996 restrict deletion of projects to admins/creators (#101) * Disable or remove project delete buttons If user can't delete, then hide/disable the button * Improve warning message * Fix linting * Remove comment * Replace tslint prettier with prettier. * Run prettier. * Run ng lint. * Run prettier with new max length. * Run eslint. * Add prettierc. * Add prettier npm script. * Fix max-line-length parameter. * Add fix options to linter and prettier. * Add prettier as dev dependency. * Fix prettier check. * Run prettier. --------- Co-authored-by: Nathan Franklin <[email protected]>
nathanfranklin
deleted the
task/DES-2131-add-github-actions-ci---merge-conflict
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Overview:
Resolve the merge conflicts.
Notes
Was looking at the react testing and wanted the github actions workflow in #95 so resolved conflicts locally while working on that. See #95 as I realized that the linting/lint-fixing isn't aligned with the changes in that PR.