Fix merge

nicolas-grekas · nicolas-grekas · commit d0547f1a9f1a · 2015-06-18T15:42:09.000+02:00
diff --git a/Http/Firewall/RememberMeListener.php b/Http/Firewall/RememberMeListener.php
@@ -95,7 +95,7 @@ public function handle(GetResponseEvent $event)
             $this->rememberMeServices->loginFail($request);
 
             if (!$this->catchExceptions) {
-                throw $failed;
+                throw $e;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function handle(GetResponseEvent $event)`
`95`	`95`	`$this->rememberMeServices->loginFail($request);`
`96`	`96`
`97`	`97`	`if (!$this->catchExceptions) {`
`98`		`- throw $failed;`
	`98`	`+ throw $e;`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`}`