{"push_id":1464622958,"size":10,"distinct_size":0,"ref":"refs/heads/hamtal","head":"dc4805c7e9dc5aba2c02337d933f81cbf8e44102","before":"aa1cc6ff9bd73fc5c6137abe94e2d9e194d6df73","commits":[{"sha":"8e210f2b80e4c20cda77020b97cc94b57d5fb931","author":{"name":"LAPTOP-NOU6017N\\eodyd","email":"db0c81bb400d5ade928124bcf1cfd13bfa9a5022@gmail.com"},"message":"no message","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/8e210f2b80e4c20cda77020b97cc94b57d5fb931"},{"sha":"06093ae393999ce8ddf50ac4637450597a1e4594","author":{"name":"LAPTOP-NOU6017N\\eodyd","email":"db0c81bb400d5ade928124bcf1cfd13bfa9a5022@gmail.com"},"message":"Merge branch 'master' of https://github.com/icoul/MazzipMetroTest into nos\n\n# Conflicts:\n#\tMazzipMetro/src/main/java/com/go/mazzipmetro/dao/RestaurantDAO.java\n#\tMazzipMetro/src/main/java/com/go/mazzipmetro/mapper/restaurant.xml\n#\tMazzipMetro/src/main/java/com/go/mazzipmetro/service/RestaurantService.java\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/aop/AdminAspect.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/controller/AdminController.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/controller/MapController.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/controller/MazzipMetroController.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/controller/RestaurantController.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/controller/UserController.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/dao/RestaurantDAO.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/dao/ReviewDAO.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/mapper/restaurant.xml\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/mapper/review.xml\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/service/RestaurantService.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/service/ReviewService.class","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/06093ae393999ce8ddf50ac4637450597a1e4594"},{"sha":"9ba79b61f700fcc8ec14aee506f12591de2a2b15","author":{"name":"CUTEHYUN\\sec","email":"21f67bd1509b46430b6536f37ef63801f338dce3@gmail.com"},"message":"no message","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/9ba79b61f700fcc8ec14aee506f12591de2a2b15"},{"sha":"d41b643b6d2acb5bc1bcb69fbe97c8d03249fc80","author":{"name":"CUTEHYUN\\sec","email":"21f67bd1509b46430b6536f37ef63801f338dce3@gmail.com"},"message":"commit","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/d41b643b6d2acb5bc1bcb69fbe97c8d03249fc80"},{"sha":"19ceb84cbe544901e22ed93e3acf7d8ec1673383","author":{"name":"nobodj","email":"30669b814b672ee5bfaef3e130034013a731ef31@naver.com"},"message":"동현_테마페이지 완성 : 내일 상세페이지에서 넘어가는 링크 만들기","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/19ceb84cbe544901e22ed93e3acf7d8ec1673383"},{"sha":"1668dbebbbc7e8928a7a41d89364ac7199330858","author":{"name":"LAPTOP-NOU6017N\\eodyd","email":"db0c81bb400d5ade928124bcf1cfd13bfa9a5022@gmail.com"},"message":"음식점 상세페이지 썸네일 작업","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/1668dbebbbc7e8928a7a41d89364ac7199330858"},{"sha":"88391a50bced8cb1ffb5dee3eeaebd6d7bf0f2a4","author":{"name":"LAPTOP-NOU6017N\\eodyd","email":"db0c81bb400d5ade928124bcf1cfd13bfa9a5022@gmail.com"},"message":"# Conflicts:\n#\tMazzipMetro/src/main/java/com/go/mazzipmetro/controller/RestaurantController.java\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/controller/RestaurantController.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/controller/UserController.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/dao/ReviewDAO.class","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/88391a50bced8cb1ffb5dee3eeaebd6d7bf0f2a4"},{"sha":"ce00d8bcb99b64b970f0f3d47f3456769f1532ab","author":{"name":"CUTEHYUN\\sec","email":"21f67bd1509b46430b6536f37ef63801f338dce3@gmail.com"},"message":"no message","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/ce00d8bcb99b64b970f0f3d47f3456769f1532ab"},{"sha":"509b0c1ec0987ddf847acb82d376efdd126507e0","author":{"name":"CUTEHYUN\\sec","email":"21f67bd1509b46430b6536f37ef63801f338dce3@gmail.com"},"message":"Merge branch 'master' of https://github.com/icoul/MazzipMetroTest","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/509b0c1ec0987ddf847acb82d376efdd126507e0"},{"sha":"dc4805c7e9dc5aba2c02337d933f81cbf8e44102","author":{"name":"nobodj","email":"30669b814b672ee5bfaef3e130034013a731ef31@naver.com"},"message":"충돌해결 및 top.jsp 테마검색 헤더메뉴 추가함.\nMerge branch 'master' of https://github.com/icoul/MazzipMetroTest\n\n# Conflicts:\n#\tMazzipMetro/src/main/webapp/WEB-INF/views/top.jsp\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/controller/MazzipMetroController.class\n#\tMazzipMetro/target/classes/com/go/mazzipmetro/controller/UserController.class","distinct":false,"url":"https://api.github.com/repos/icoul/MazzipMetroTest/commits/dc4805c7e9dc5aba2c02337d933f81cbf8e44102"}]}
{"actor":{"display_login":"hamtal"}}