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

Merge #343 into master #345

Merged
merged 4 commits into from
Oct 8, 2015
Merged

Merge #343 into master #345

merged 4 commits into from
Oct 8, 2015

Conversation

mvidner
Copy link
Member

@mvidner mvidner commented Oct 8, 2015

No description provided.

mvidner and others added 4 commits October 5, 2015 09:09
…48206)

"ipv6_forward" as element name is OK to be duplicated, as long it is
disambiguated by parent elements. But the relax NG definitions have to
be unique, and "ipv6_forward" also occurs in security.rnc
Relax-NG ... Some defines for ipv6_forward needs the combine attribute
Conflicts:
	package/yast2-network.changes
	package/yast2-network.spec
@jreidinger
Copy link
Member

LGTM

mvidner added a commit that referenced this pull request Oct 8, 2015
@mvidner mvidner merged commit c312811 into master Oct 8, 2015
@mvidner mvidner deleted the relaxng-compilable-m branch October 8, 2015 12:23
@mvidner
Copy link
Member Author

mvidner commented Oct 14, 2015

(Cross reference, let GitHub make a link: this is a merge of #343)

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