Commit a44804dbc46e68e912d75b9f83885c351db2270e
1 parent
e8dff0e1
fix formatting error
Showing
1 changed file
with
0 additions
and
4 deletions
Show diff stats
README.md
| ... | ... | @@ -17,8 +17,4 @@ visuals.py provides a cool function to graphically represent the N-Lateration di |
| 17 | 17 | ### Example |
| 18 | 18 | [Click here to view output gif example](https://dantz.fr/LO53/out_rgb.gif?) (too big to be displayed) |
| 19 | 19 | |
| 20 | -<<<<<<< HEAD | |
| 21 | 20 | [Or here for the shades of grey version](https://dantz.fr/LO53/out.gif?) |
| 22 | -======= | |
| 23 | -[Or here for the shades of grey version](https://dantz.fr/LO53/out.gif?) (too big to be displayed) | |
| 24 | ->>>>>>> refs/remotes/origin/master | ... | ... |