diff options
| author | tvayer <titouan.vayer@gmail.com> | 2019-05-28 17:13:21 +0200 |
|---|---|---|
| committer | tvayer <titouan.vayer@gmail.com> | 2019-05-28 17:13:21 +0200 |
| commit | cd4b98c34f885176f33db3fab16530622f29ab42 (patch) | |
| tree | a886eb333c20c964ef24fbc3958c78af9657a54a /ot/bregman.py | |
| parent | b1b514f5d9de009e63bd407dfd9c0a0cf6128876 (diff) | |
solve conlict
Diffstat (limited to 'ot/bregman.py')
| -rw-r--r-- | ot/bregman.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ot/bregman.py b/ot/bregman.py index 9040429..7be67b8 100644 --- a/ot/bregman.py +++ b/ot/bregman.py @@ -5,6 +5,7 @@ Bregman projections for regularized OT # Author: Remi Flamary <remi.flamary@unice.fr> # Nicolas Courty <ncourty@irisa.fr> +# Kilian Fatras <kilian.fatras@irisa.fr> # Titouan Vayer <titouan.vayer@irisa.fr> # License: MIT License |