Commit 121f03d
committed
Merge remote-tracking branch 'codra/feature/20-sum-lines-or-col' into feature/20-sum-lines-or-col
# Conflicts:
# datalab/gui/actionhandler.py
# datalab/gui/processor/image.py
# datalab/locale/fr/LC_MESSAGES/datalab.po
# doc/features/image/menu_analysis.rst
# doc/locale/fr/LC_MESSAGES/features/image/menu_analysis.po2 files changed
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
664 | 664 | | |
665 | 665 | | |
666 | 666 | | |
667 | | - | |
668 | 667 | | |
669 | 668 | | |
670 | 669 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
0 commit comments