Merge remote-tracking branch 'origin/master'
authorSylvain Papa <sylvain.papa@yahoo.fr>
Wed, 16 Jan 2019 12:54:06 +0000 (13:54 +0100)
committerSylvain Papa <sylvain.papa@yahoo.fr>
Wed, 16 Jan 2019 12:54:06 +0000 (13:54 +0100)
# Conflicts:
# src/Main.java

1  2 
src/Origin.java

diff --cc src/Origin.java
Simple merge