Browse Source

Fix merge error in previous commit

Issue: SPR-11385
pull/455/head
Sam Brannen 12 years ago
parent
commit
3a89bc4b26
  1. 1
      spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj

1
spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj

@ -182,7 +182,6 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth @@ -182,7 +182,6 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
c.setThrow(throwable);
}
}
}
private final Expectations expectations = new Expectations();

Loading…
Cancel
Save