{"head":"96e559daab1c6169ded9dcba7a002e483226367e","size":1,"push_id":46891920,"ref":"refs/heads/master","commits":[{"sha":"96e559daab1c6169ded9dcba7a002e483226367e","author":{"name":"thinkdeeply","email":"6ad8d701d6f16baed8f1f7bb92759b54a92d5d13@gmail.com"},"url":"https://api.github.com/repos/zhang-yan-talendbj/deppDemo/commits/96e559daab1c6169ded9dcba7a002e483226367e","message":"Merge github.com:zhang-yan-talendbj/deppDemo\n\nConflicts:\n\t.gitignore\n\tarchetype.template/com.caribe.stone.archetype.domain/archetype.bat\n\tarchetype.template/com.caribe.stone.archetype.domain/pom.xml\n\tarchetype.template/com.caribe.stone.archetype.web/archetype.bat\n\tcom.caribe.megalith.core/src/main/java/deppDemo/WarDemo.java\n\tcom.caribe.stone.openjpa/pom.xml\n\tcom.caribe.stone.openjpa/src/test/java/foo/domain/PersonTest.java\n\tcom.caribe.stone.parent/pom.xml\n\tcom.caribe.stone.pdfbox/pom.xml\n\tcom.caribe.stone.pdfbox/src/main/java/foo/PDFReader.java\n\tcom.caribe.stone.pdfbox/src/main/java/foo/domain/App.java\n\tcom.caribe.stone.spring/src/main/java/com/depp/stone/spring/App.java\n\tcom.caribe.stone.spring/src/main/resource/applicationContext.xml\n\tcom.caribe.stone.spring/src/test/java/com/depp/stone/spring/TestUserService.java\n\tcom.caribe.stone.spring/src/test/java/com/depp/stone/spring/bean/instantiation/Bean.java\n\tcom.caribe.stone.spring/src/test/java/com/depp/stone/spring/bean/instantiation/InstantiatingBeanTest.java\n\tcom.caribe.stone.spring/src/test/resource/applicationContext.xml\n\tcom.caribe.stone.spring/src/test/resource/com/depp/stone/spring/bean/instantiation/InstantiatingBeanTest-context.xml\n\tcom.caribe.stone.spring/src/test/resources/applicationContext.xml\n\tcom.caribe.stone.spring/src/test/resources/com/depp/stone/spring/bean/instantiation/InstantiatingBeanTest-context.xml\n\tcom.caribe.stone.spring/src/test/resources/com/depp/stone/spring/resource/ResourceTest-context.xml\n\tcom.caribe.store.javamail/pom.xml\n\tcom.caribe.store.javamail/src/main/java/foo/App.java\n\tcom.depp.stone.spring/target/classes/applicationContext.xml\n\tcom.depp.stone.spring/target/classes/com/depp/stone/spring/bean/instantiation/InstantiatingBeanTest-context.xml\n\tdeppDemo/com.caribe.stone.archetype.spring/target/classes/applicationContext.xml\n\tgitDemo/welcome.txt"}],"legacy":{"head":"96e559daab1c6169ded9dcba7a002e483226367e","size":1,"push_id":46891920,"shas":[["96e559daab1c6169ded9dcba7a002e483226367e","rockflyrain@gmail.com","Merge github.com:zhang-yan-talendbj/deppDemo\n\nConflicts:\n\t.gitignore\n\tarchetype.template/com.caribe.stone.archetype.domain/archetype.bat\n\tarchetype.template/com.caribe.stone.archetype.domain/pom.xml\n\tarchetype.template/com.caribe.stone.archetype.web/archetype.bat\n\tcom.caribe.megalith.core/src/main/java/deppDemo/WarDemo.java\n\tcom.caribe.stone.openjpa/pom.xml\n\tcom.caribe.stone.openjpa/src/test/java/foo/domain/PersonTest.java\n\tcom.caribe.stone.parent/pom.xml\n\tcom.caribe.stone.pdfbox/pom.xml\n\tcom.caribe.stone.pdfbox/src/main/java/foo/PDFReader.java\n\tcom.caribe.stone.pdfbox/src/main/java/foo/domain/App.java\n\tcom.caribe.stone.spring/src/main/java/com/depp/stone/spring/App.java\n\tcom.caribe.stone.spring/src/main/resource/applicationContext.xml\n\tcom.caribe.stone.spring/src/test/java/com/depp/stone/spring/TestUserService.java\n\tcom.caribe.stone.spring/src/test/java/com/depp/stone/spring/bean/instantiation/Bean.java\n\tcom.caribe.stone.spring/src/test/java/com/depp/stone/spring/bean/instantiation/InstantiatingBeanTest.java\n\tcom.caribe.stone.spring/src/test/resource/applicationContext.xml\n\tcom.caribe.stone.spring/src/test/resource/com/depp/stone/spring/bean/instantiation/InstantiatingBeanTest-context.xml\n\tcom.caribe.stone.spring/src/test/resources/applicationContext.xml\n\tcom.caribe.stone.spring/src/test/resources/com/depp/stone/spring/bean/instantiation/InstantiatingBeanTest-context.xml\n\tcom.caribe.stone.spring/src/test/resources/com/depp/stone/spring/resource/ResourceTest-context.xml\n\tcom.caribe.store.javamail/pom.xml\n\tcom.caribe.store.javamail/src/main/java/foo/App.java\n\tcom.depp.stone.spring/target/classes/applicationContext.xml\n\tcom.depp.stone.spring/target/classes/com/depp/stone/spring/bean/instantiation/InstantiatingBeanTest-context.xml\n\tdeppDemo/com.caribe.stone.archetype.spring/target/classes/applicationContext.xml\n\tgitDemo/welcome.txt","thinkdeeply"]],"ref":"refs/heads/master"}}