Author: jleroux
Date: Mon Nov 10 08:32:31 2014
New Revision: 1637807
URL: http://svn.apache.org/r1637807
Log:
Reverts r1583689, thanks to Scott's message on dev ML. Unfortunately we have no
tests for that in R11.04 (not sure about the rest) since my last commit
(r1623396) passed the tests
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/framework/common/data/GeoData.xml
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Reverse-merged /ofbiz/trunk:r1583689
Modified: ofbiz/branches/release11.04/framework/common/data/GeoData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/data/GeoData.xml?rev=1637807&r1=1637806&r2=1637807&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/common/data/GeoData.xml (original)
+++ ofbiz/branches/release11.04/framework/common/data/GeoData.xml Mon Nov 10
08:32:31 2014
@@ -318,7 +318,4 @@ under the License.
<GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="NIRL"/>
<GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="WALS"/>
- <CountryAddressFormat geoId="MYS" geoAssocTypeId="REGIONS"
requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
- <CountryAddressFormat geoId="THA" geoAssocTypeId="REGIONS"
requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
- <CountryAddressFormat geoId="ISR" geoAssocTypeId="REGIONS"
requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
</entity-engine-xml>
