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 reverted Macro page changes #722

Merged
merged 1 commit into from
Oct 31, 2017
Merged

Conversation

GoFroggyRun
Copy link
Contributor

For some reason, #684 was accidentally reverted while auto merging. This PR retained the reverted changes.

@hdoupe could you take a look and merge.

@hdoupe
Copy link
Collaborator

hdoupe commented Oct 31, 2017

@GoFroggyRun That's strange. Was it written over when another PR was merged?

@GoFroggyRun
Copy link
Contributor Author

@hdoupe it seems so. These changes got over-written when the flat blocks PR got merged.

@hdoupe hdoupe merged commit 93b0970 into ospc-org:master Oct 31, 2017
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.

3 participants