Skip to content

reverting component notebook to work with reverted landlab#24

Merged
kbarnhart merged 3 commits intoreleasefrom
barnhark/revert_profiler
Jun 6, 2018
Merged

reverting component notebook to work with reverted landlab#24
kbarnhart merged 3 commits intoreleasefrom
barnhark/revert_profiler

Conversation

@kbarnhart
Copy link
Copy Markdown
Collaborator

I've set the profile code back to how it was as of this state

@kbarnhart kbarnhart requested a review from SiccarPoint May 15, 2018 22:08
@kbarnhart
Copy link
Copy Markdown
Collaborator Author

block 24 was changed

@SiccarPoint
Copy link
Copy Markdown
Contributor

Perfect. I note there are some edit conflicts here though, that I leave it to you to resolve. Once you have, merge away.

@kbarnhart
Copy link
Copy Markdown
Collaborator Author

Looks like the only failure is at the level of install. So I'm merging not that I've dealt with the conflicts.

@kbarnhart kbarnhart merged commit 3fd535f into release Jun 6, 2018
@kbarnhart kbarnhart deleted the barnhark/revert_profiler branch June 6, 2018 00:26
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