Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

[OPM.gov] Update and reactivate ruleset - #12228

Merged
J0WI merged 2 commits into
EFForg:masterfrom
Bisaloo:patch-28
Sep 11, 2017
Merged

J0WI merged 2 commits into
EFForg:masterfrom
Bisaloo:patch-28

Conversation

@Bisaloo

@Bisaloo Bisaloo commented Aug 30, 2017

Copy link
Copy Markdown
Collaborator

#11513 was asking to merge in the wrong branch and I have no idea how to fix it.

Comment thread src/chrome/content/rules/OPM.gov.xml Outdated
<target host= "apps.opm.gov" />
<target host= "leadership.opm.gov" />
<target host= "listserv.opm.gov" />
<ruleset name="OPM.gov">

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This rule is only partial (or would you like to enhance the coverage?)

@J0WI J0WI added the conflict label Sep 8, 2017
@J0WI

J0WI commented Sep 11, 2017

Copy link
Copy Markdown
Contributor

LGTM, could you rebase against current master?

@J0WI
J0WI merged commit 8b7a0f9 into EFForg:master Sep 11, 2017
@Bisaloo
Bisaloo deleted the patch-28 branch September 12, 2017 05:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants