Skip to content

Conversation

@danielru
Copy link
Member

Fixes #80

@pancetta
Copy link
Member

meh, meh, meh.. the last merge of PR #81 created conflicts for this one. please resolve.

@danielru danielru force-pushed the add/dirk_order_five branch from b6298b9 to bcb25d6 Compare May 20, 2016 08:31
@danielru
Copy link
Member Author

Rebased branch to master, conflicts should now be gone.

@pancetta pancetta merged commit 008112d into Parallel-in-Time:master May 20, 2016
@danielru danielru deleted the add/dirk_order_five branch May 20, 2016 08:41
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