Resolve conflicts
Showing
- fluidsim/__init__.py 2 additions, 1 deletionfluidsim/__init__.py
- fluidsim/_version.py 20 additions, 0 deletionsfluidsim/_version.py
- fluidsim/base/output/base.py 14 additions, 13 deletionsfluidsim/base/output/base.py
- fluidsim/base/output/phys_fields.py 5 additions, 2 deletionsfluidsim/base/output/phys_fields.py
- fluidsim/base/test/test_base_solver.py 4 additions, 6 deletionsfluidsim/base/test/test_base_solver.py
- fluidsim/operators/operators0d.py 3 additions, 3 deletionsfluidsim/operators/operators0d.py
- setup.py 1 addition, 0 deletionssetup.py
Loading
Please register or sign in to comment