From cd4b98c34f885176f33db3fab16530622f29ab42 Mon Sep 17 00:00:00 2001
From: tvayer <titouan.vayer@gmail.com>
Date: Tue, 28 May 2019 17:13:21 +0200
Subject: solve conlict

---
 ot/bregman.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ot/bregman.py')

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
 
-- 
cgit v1.2.3