From 2a1338ba1979601fbf544b3f3a4818410a2c3a39 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 18 Jun 2015 15:40:06 +0200
Subject: [PATCH] Fix merge

---
 .../Component/Security/Http/Firewall/RememberMeListener.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
index 7234c1d394..f5ec8c7113 100644
--- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
@@ -95,7 +95,7 @@ class RememberMeListener implements ListenerInterface
             $this->rememberMeServices->loginFail($request);
 
             if (!$this->catchExceptions) {
-                throw $failed;
+                throw $e;
             }
         }
     }