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.

Sign up for GitHub

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

Jump to bottom

removes redundant task termination signals #94

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

removes redundant task termination signals #94

wants to merge 1 commit into from

Conversation

Amrita42
Copy link
Contributor

@tomschr tomschr marked this pull request as draft December 20, 2023 10:40
@tomschr
Copy link
Member

tomschr commented Dec 20, 2023 •
edited
Loading

@Amrita42 There is a conflict in the file. You probably branched from an old state.

This is the conflict:

<<<<<<< remove-task-termination 
=======
  <doc cat="smartdocs" doc="PAM-security" branches="main">PAM introduction</doc>
>>>>>>> main

You need to keep the "PAM-security" entry and remove the conflict markers. If you can resolve that, I'm able to merge it. Thanks! 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomschr tomschr Awaiting requested review from tomschr tomschr is a code owner

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Amrita42 @tomschr