Skip to content

Revert changes from OL8 STIG profile that cause conflict with master#8431

Merged
yuumasato merged 1 commit intoComplianceAsCode:stabilization-v0.1.61from
ggbecker:fix-merge-master
Mar 25, 2022
Merged

Revert changes from OL8 STIG profile that cause conflict with master#8431
yuumasato merged 1 commit intoComplianceAsCode:stabilization-v0.1.61from
ggbecker:fix-merge-master

Conversation

@ggbecker
Copy link
Copy Markdown
Member

Description:

  • Revert changes from OL8 STIG profile that cause conflict with master.

@ggbecker ggbecker added this to the 0.1.61 milestone Mar 25, 2022
@yuumasato yuumasato self-assigned this Mar 25, 2022
Copy link
Copy Markdown
Member

@yuumasato yuumasato left a comment

Choose a reason for hiding this comment

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

LGTM, the conflicts are resolved.

@github-actions
Copy link
Copy Markdown

Start a new ephemeral environment with changes proposed in this pull request:

Open in Gitpod

@yuumasato yuumasato merged commit 6833269 into ComplianceAsCode:stabilization-v0.1.61 Mar 25, 2022
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