diff options
| author | xrg <> | 2009-11-20 20:01:04 +0530 |
|---|---|---|
| committer | Harry (Open ERP) <hmo@tinyerp.com> | 2009-11-20 20:01:04 +0530 |
| commit | dad1ff955b636ccbad687f2f3f731ee8f512bd6f (patch) | |
| tree | e3405d96ef59f72094e5e300db24fb713e2b8838 /bin/addons/base/base_data.xml | |
| parent | b2a9a804ebf6c93ebe98751dd6b1008b8fe09306 (diff) | |
| parent | f566ea57a83bab87a8c7fa9743d190b4520c89e2 (diff) | |
[merge] merge from lp:~xrg/openobject-server/optimize-5.0 and removed some confilts
bzr revid: hmo@tinyerp.com-20091120143104-tb6136unkdw7yfy9
Diffstat (limited to 'bin/addons/base/base_data.xml')
| -rw-r--r-- | bin/addons/base/base_data.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml index 64c5f191fbb..710bddeb73d 100644 --- a/bin/addons/base/base_data.xml +++ b/bin/addons/base/base_data.xml @@ -574,7 +574,7 @@ <field name="code">mh</field> </record> <record id="mk" model="res.country"> - <field name="name">Macedonia</field> + <field name="name">FYROM</field> <field name="code">mk</field> </record> <record id="ml" model="res.country"> |