{"push_id":1081838147,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"3bb12c8795bff455a1a3adacf40ad366ea33929a","before":"1cf8afd47e06024080c97ff057d1308eb213089e","commits":[{"sha":"68c2d1c5f2a394a71cc9322c2b0e6ba80734bd81","author":{"email":"10ad36ad0097e0d83513f0026edb2598fafe2939@gamail.com","name":"nhanlnhth"},"message":"đệc cụ","distinct":true,"url":"https://api.github.com/repos/SoseUIT034/Quan-Ly-Can-Bo-Thanh-Doan/commits/68c2d1c5f2a394a71cc9322c2b0e6ba80734bd81"},{"sha":"f83533af8b29eef9983332237dac0fb6ee52075c","author":{"email":"10ad36ad0097e0d83513f0026edb2598fafe2939@gamail.com","name":"nhanlnhth"},"message":"Merge branch 'master' of https://github.com/SoseUIT034/Quan-Ly-Can-Bo-Thanh-Doan\n\n# Conflicts:\n#\tsource/qlcb/src/main/java/com/springmvc/qlcb/controller/CreateStaffController.java\n#\tsource/qlcb/src/main/java/com/springmvc/qlcb/model/Lylich.java\n#\tsource/qlcb/target/classes/com/springmvc/qlcb/controller/UserController.class\n#\tsource/qlcb/target/classes/com/springmvc/qlcb/model/Lylich.class\n#\tsource/qlcb/target/m2e-wtp/web-resources/META-INF/maven/com.springmvc/qlcb/pom.properties","distinct":true,"url":"https://api.github.com/repos/SoseUIT034/Quan-Ly-Can-Bo-Thanh-Doan/commits/f83533af8b29eef9983332237dac0fb6ee52075c"},{"sha":"3bb12c8795bff455a1a3adacf40ad366ea33929a","author":{"email":"10ad36ad0097e0d83513f0026edb2598fafe2939@gamail.com","name":"nhanlnhth"},"message":"Merge branch 'master' of https://github.com/SoseUIT034/Quan-Ly-Can-Bo-Thanh-Doan\n\n# Conflicts:\n#\tsource/qlcb/src/main/java/com/springmvc/qlcb/model/Dienbienluong.java\n#\tsource/qlcb/src/main/java/com/springmvc/qlcb/model/Lylich.java\n#\tsource/qlcb/target/classes/com/springmvc/qlcb/model/Lylich.class\n#\tsource/qlcb/target/m2e-wtp/web-resources/META-INF/maven/com.springmvc/qlcb/pom.properties","distinct":true,"url":"https://api.github.com/repos/SoseUIT034/Quan-Ly-Can-Bo-Thanh-Doan/commits/3bb12c8795bff455a1a3adacf40ad366ea33929a"}]}