Resolved merge conflict

qgis · Mar 27, 2012 · 0e537f2f951116fab3e1fdb785c8bc06d13d7cc5 · 0e537f2
1 parent c936d03
commit 0e537f2f951116fab3e1fdb785c8bc06d13d7cc5
Showing with 2 additions and 2 deletions.

+2 −2 doc/TRANSLATORS
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
@@ -24,8 +24,8 @@ German|Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho
 Greek|Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves
 Hungarian|Siki Zoltan
 Icelandic|Thordur Ivarsson
-Indonesian|Januar V. Simarmata
-Italian|Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano
+Indonesian|Januar V. Simarmata, I Made Anombawa
+Italian|Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano, Roberto Angeletti, Alessandro Fanna
 Japanese|BABA Yoshihiko, Yoichi Kayama
 Lao|Anousak Souphavanh
 Latvian|Maris Nartiss, Pēteris Brūns