From 72bf6dc56d5db09703bfe3efe9fcfa5f5026ee85 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Wed, 29 May 2013 17:25:41 +0200
Subject: [PATCH] // bad commit

---
 controllers/front/AuthController.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 3c2a2b4e4..745cca405 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -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;