Colin Powell f5a639ed07 [gtk] Fixes merge conflict in servers file 4 mesiacov pred
..
.config f5a639ed07 [gtk] Fixes merge conflict in servers file 4 mesiacov pred