tree e6229610811919884a4364355fc23799a4d8b50a
parent 834e76165c8ecae1f2e16f52ef4e27e62ade91dd
parent 7b552fc960e9906364a5b8f715c790ebf7e6bf76
author Akron <nils@diewald-online.de> 1473692638 +0200
committer Akron <nils@diewald-online.de> 1473692638 +0200

Fixed readme conflict