Skip to content
Snippets Groups Projects
Commit c8fef4d3 authored by Martin Schneider's avatar Martin Schneider
Browse files

Merge branch 'feature/box-adaptive' of... 

Merge branch 'feature/box-adaptive' of https://git.iws.uni-stuttgart.de/dumux-repositories/dumux into feature/box-adaptive

Conflicts:
	dumux/porousmediumflow/2p/implicit/adaptionhelper.hh
	test/porousmediumflow/2p/implicit/CMakeLists.txt
	test/porousmediumflow/2p/implicit/lensproblem.hh
parents ce937e5a eff10595
No related branches found
No related tags found
1 merge request!219Feature/box adaptive
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment