Colin Powell f5a639ed07 [gtk] Fixes merge conflict in servers file 2 mesi fa
..
.config f5a639ed07 [gtk] Fixes merge conflict in servers file 2 mesi fa