diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-04-17 16:33:13 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2019-04-17 16:33:13 +0100 |
| commit | cc9e5d510378e1810d0a1a6b0fe70279389255be (patch) | |
| tree | 6c9baf386ada2540d559e6890ae3ebe31ccd2af4 /Wrappers | |
| parent | 7013771a84421dd8a03385ef94c38f456517ee77 (diff) | |
| download | framework-cc9e5d510378e1810d0a1a6b0fe70279389255be.tar.gz framework-cc9e5d510378e1810d0a1a6b0fe70279389255be.tar.bz2 framework-cc9e5d510378e1810d0a1a6b0fe70279389255be.tar.xz framework-cc9e5d510378e1810d0a1a6b0fe70279389255be.zip | |
fixed conflict
Diffstat (limited to 'Wrappers')
| -rw-r--r-- | Wrappers/Python/ccpi/optimisation/functions/KullbackLeibler.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/KullbackLeibler.py b/Wrappers/Python/ccpi/optimisation/functions/KullbackLeibler.py index cc3356a..c277482 100644 --- a/Wrappers/Python/ccpi/optimisation/functions/KullbackLeibler.py +++ b/Wrappers/Python/ccpi/optimisation/functions/KullbackLeibler.py @@ -20,12 +20,8 @@ import numpy from ccpi.optimisation.functions import Function from ccpi.optimisation.functions.ScaledFunction import ScaledFunction -<<<<<<< HEAD -from ccpi.framework import ImageData -======= from ccpi.framework import ImageData, ImageGeometry import functools ->>>>>>> composite_operator_datacontainer class KullbackLeibler(Function): |