// bad commit

2013-05-29 17:25:41 +02:00
parent cd17b78522
commit 72bf6dc56d
1 changed files with 0 additions and 4 deletions
@@ -489,11 +489,7 @@ class AuthControllerCore extends FrontController
 			$this->errors = array_unique(array_merge($this->errors, $address->validateController()));

 			// US customer: normalize the address
-<<<<<<< HEAD
 			if ($address->id_country == Country::getByIso('US') && Configuration::get('PS_TAASC'))
-=======
-			if ($address->id_country == Country::getByIso('US'))
->>>>>>> a04e6b1a67fc34bd1049e546283cb5a938fd2279
 			{
 				include_once(_PS_TAASC_PATH_.'AddressStandardizationSolution.php');
 				$normalize = new AddressStandardizationSolution;