-
Christos Stavrakakis authored
Fix wrong conflict resolution in merge commit e3e8c90f . Also, update CONTRIBUTORS file. Signed-off-by: Christos Stavrakakis <stavr.chris@gmail.com>
f5885b77
Fix wrong conflict resolution in merge commit e3e8c90f . Also, update CONTRIBUTORS file. Signed-off-by: Christos Stavrakakis <stavr.chris@gmail.com>