Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add ask to delete to delete workunits #380

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

dehilsterlexis
Copy link
Contributor

if (!selection || selection.label == localize("No"))
return;
this._wu.delete().then(() => this._tree.refresh());
});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation looks weird

@GordonSmith
Copy link
Member

@dehilsterlexis Looks like you merged trunk into this branch, instead of rebasing this branch onto upstream/trunk?

@dehilsterlexis
Copy link
Contributor Author

dehilsterlexis commented Feb 6, 2024

@GordonSmith I tried using the conflict resolution in github and it added a second commit.

Signed-off-by: David de Hilster <david.dehilster@lexisnexisrisk.com>
@GordonSmith
Copy link
Member

Yes that is what it looked like, I have straightened it out, but in the future just rebase to resolve any conflicts...

@GordonSmith GordonSmith merged commit 8a31383 into hpcc-systems:trunk Feb 7, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants