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

Fix for issue 294 #296

Merged
merged 3 commits into from
Nov 17, 2016
Merged

Fix for issue 294 #296

merged 3 commits into from
Nov 17, 2016

Conversation

denis-kalinin
Copy link

@denis-kalinin denis-kalinin commented Jun 10, 2016

Changed in root-documentation.js function getDocumetationContent to
split lines by regex considering CR + LF

closes issue #294

Denis Kalinin added 2 commits June 10, 2016 20:10
Changed in root-documentation.js function getDocumetationContent to
split lines by regex considering CR + LF
@sichvoge
Copy link
Contributor

Seems there are conflicts you would need to resolve :)

This reverts commit 1cd3d33.
@denis-kalinin
Copy link
Author

O-la-la!!! 😥 It was a night push... Forgot to switch a branch

Copy link
Contributor

@llattes llattes left a comment

Choose a reason for hiding this comment

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

Could you please rebase with the latest of mulesoft:master?

@agustinlg agustinlg changed the base branch from master to develop November 17, 2016 19:24
@agustinlg agustinlg merged commit 6430218 into mulesoft:develop Nov 17, 2016
@agustinlg agustinlg added this to the v3.0.11 milestone Nov 18, 2016
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.

5 participants