Colin Powell f5a639ed07 [gtk] Fixes merge conflict in servers file hai 1 mes
..
.config f5a639ed07 [gtk] Fixes merge conflict in servers file hai 1 mes