diff options
| author | MathieuCarriere <mathieu.carriere3@gmail.com> | 2020-04-28 10:31:12 -0400 |
|---|---|---|
| committer | MathieuCarriere <mathieu.carriere3@gmail.com> | 2020-04-28 10:31:12 -0400 |
| commit | 51ca2370ae27bec052bb4fffafc8a718ac306264 (patch) | |
| tree | 67e1ea14d4c290295b0298dba0d701303a53f3b6 /src/python/doc/bottleneck_distance_user.rst | |
| parent | 910f29401e053f668e4d277af098295ab05e6022 (diff) | |
| parent | 0fb22e4c499b665ad505e5d9d2c325f7561f69c4 (diff) | |
fix conflict
Diffstat (limited to 'src/python/doc/bottleneck_distance_user.rst')
| -rw-r--r-- | src/python/doc/bottleneck_distance_user.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/python/doc/bottleneck_distance_user.rst b/src/python/doc/bottleneck_distance_user.rst index 9435c7f1..89da89d3 100644 --- a/src/python/doc/bottleneck_distance_user.rst +++ b/src/python/doc/bottleneck_distance_user.rst @@ -65,3 +65,4 @@ The output is: Bottleneck distance approximation = 0.81 Bottleneck distance value = 0.75 + |