summaryrefslogtreecommitdiff
path: root/bin/addons/base/base_data.xml
diff options
context:
space:
mode:
authorMantavya Gajjar <mga@tinyerp.com>2009-11-26 17:06:53 +0530
committerMantavya Gajjar <mga@tinyerp.com>2009-11-26 17:06:53 +0530
commitbbe48761e4d9c6d9844bae92dac61afc7ec0ce99 (patch)
tree180fa5b70de5c2c518e0ecf0079c02c643e6e109 /bin/addons/base/base_data.xml
parentd365fbeb13fe41e30535d0bdbbdbca969ca818f2 (diff)
parentb7f7fdefaf58ef3e183a450b68a8796ca2bdaf24 (diff)
[MERGE]: merging from the same branch
bzr revid: mga@tinyerp.com-20091126113653-0ym60nvtjinvp82h
Diffstat (limited to 'bin/addons/base/base_data.xml')
-rw-r--r--bin/addons/base/base_data.xml2
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">