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

Doc: Converted Bower docs from xml to md #105021

Merged
merged 1 commit into from Dec 7, 2020
Merged

Conversation

wiltaylor
Copy link
Contributor

Motivation for this change

Converted xml docs to md docs as per issue # #104963

Things done

Converted xml to md and updated index.xml to reference it.

@r-burns
Copy link
Contributor

r-burns commented Nov 26, 2020

Rendered

doc/languages-frameworks/bower.section.md Outdated Show resolved Hide resolved
doc/languages-frameworks/bower.section.md Show resolved Hide resolved
@veprbl veprbl linked an issue Nov 26, 2020 that may be closed by this pull request
@jtojnar
Copy link
Contributor

jtojnar commented Dec 6, 2020

Could you also resolve the conflict and squash the changes?

@jtojnar
Copy link
Contributor

jtojnar commented Dec 6, 2020

There is still a merge conflict, could you rebase onto latest master? And have the squashed commit proper commit message (e.g. doc: Convert Bower docs from xml to md)

@wiltaylor
Copy link
Contributor Author

Sorry about all the mess about with this one. Dug myself into a hole with all the merge conflicts but think i have solved them all now.

@jtojnar jtojnar merged commit 2eb20aa into NixOS:master Dec 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Convert Bower from Docbook to CommonMark
3 participants