resolve a stupid conflict..
commit2131e3fac60ffc088a84d62d5a73d96d8d6dd5e6
authorMarco Ciampa <ciampix@libero.it>
Sat, 25 Aug 2001 19:02:04 +0000 (25 19:02 +0000)
committerMarco Ciampa <ciampix@libero.it>
Sat, 25 Aug 2001 19:02:04 +0000 (25 19:02 +0000)
treed1df3ceb95d588139486193df1245a5cc8d6a678
parentc1b2a2983329da2d67c7e716eaae81b303021c16
resolve a stupid conflict..
po/it.po