Merge remote-tracking branch 'origin/master'

# Conflicts: # Chapter3-2-7/src/test/java/com/didispace/ApplicationTests.java
2016-08-19 23:12:18 +08:00
parent 1c355c3ffe ae68a47506
commit cbc8af61a4
2 changed files with 8 additions and 6 deletions
@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;


@RunWith(SpringJUnit4ClassRunner.class)
@@ -29,4 +28,4 @@ public class ApplicationTests {
 		Assert.assertEquals(20, u.getAge().intValue());
 	}

-}
+}