resolve a stupid conflict..

This commit is contained in:
Marco Ciampa 2001-08-25 19:02:04 +00:00
parent c1b2a29833
commit 2131e3fac6

3841
po/it.po

File diff suppressed because it is too large Load Diff