Commit 52ce7d3
committed
Merge branch 'major-testing' into major
# Conflicts:
# tests/actions/test_activity_actions.py
# tests/actions/test_database_actions.py
# tests/actions/test_method_actions.py
# tests/conftest.py
# tests_old/legacy/test_settings.py
# tests_old/legacy/test_uncertainty.py
# tests_old/legacy/test_utils.py
# tests_old/legacy/test_widgets.py
# tests_old/widgets/test_custom_allocation_editor.py
# tests_old/widgets/test_property_editor.py
# tests_old/widgets/test_tag_editor.py
# tests_old/wizards/test_export_wizard.py
# tests_old/wizards/test_import_wizard.py
# tests_old/wizards/test_uncertainty_wizard.py47 files changed
Lines changed: 2797 additions & 1292 deletions
File tree
- activity_browser
- bwutils
- layouts/pages/activity_details
- mod/bw2data_bak
- backends
- ui/widgets
- tests_old
- actions
- legacy
- widgets
- wizards
- tests
- actions
- fixtures
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | | - | |
| 108 | + | |
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
582 | 582 | | |
583 | 583 | | |
584 | 584 | | |
585 | | - | |
| 585 | + | |
586 | 586 | | |
587 | 587 | | |
588 | 588 | | |
| |||
This file was deleted.
This file was deleted.
This file was deleted.
0 commit comments