From 3a89bc4b266c9ab351a33727eaa8d0236b6f737b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 4 Feb 2014 23:27:35 +0100
Subject: [PATCH] Fix merge error in previous commit

Issue: SPR-11385
---
 .../mock/staticmock/AbstractMethodMockingControl.aj              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
index f0010febca..4661840f61 100644
--- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
+++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
@@ -181,7 +181,6 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 			}
 			c.setThrow(throwable);
 		}
-		}
 	}