{"push_id":1112993115,"size":5,"distinct_size":1,"ref":"refs/heads/development","head":"96cb9b7c9b66c6583fe7d6da34d8a8121779956b","before":"3e3f987652b541065ed6ada6e07d2a8310b90584","commits":[{"sha":"ddff415a96ebb624395b60ea1528dd1a1d6b4ef2","author":{"email":"237d99e890afdf89ab33e55175b95c69109c7e7a@naver.com","name":"js4hyun"},"message":"fix commit","distinct":false,"url":"https://api.github.com/repos/LeeJiu/teamportfolio_disgaea/commits/ddff415a96ebb624395b60ea1528dd1a1d6b4ef2"},{"sha":"bbdc20dbb4b7db73264464d377633d6e9e9695a1","author":{"email":"237d99e890afdf89ab33e55175b95c69109c7e7a@naver.com","name":"js4hyun"},"message":"Merge remote-tracking branch 'refs/remotes/origin/development' into jihyun\n\n# Conflicts:\n#\taStar.cpp\n#\taStar.h\n#\tcharacter.cpp\n#\tcharacter.h\n#\tenemy.h\n#\tgameObject.cpp\n#\tgameObject.h\n#\tgameStudy.cpp\n#\tgameStudy.h\n#\tinventory.cpp\n#\tinventory.h\n#\titem.cpp\n#\titem.h\n#\tmapTool.cpp\n#\tmapTool.h\n#\tnpc.h\n#\tselectStage.cpp\n#\tselectStage.h\n#\tstore.cpp\n#\tstore.h\n#\ttitle.cpp\n#\ttitle.h\n#\ttown.cpp\n#\ttown.h\n#\tutils.h","distinct":false,"url":"https://api.github.com/repos/LeeJiu/teamportfolio_disgaea/commits/bbdc20dbb4b7db73264464d377633d6e9e9695a1"},{"sha":"670798cde73ce6b50e234469f04143080baabd81","author":{"email":"237d99e890afdf89ab33e55175b95c69109c7e7a@naver.com","name":"js4hyun"},"message":"fix conflict","distinct":false,"url":"https://api.github.com/repos/LeeJiu/teamportfolio_disgaea/commits/670798cde73ce6b50e234469f04143080baabd81"},{"sha":"53589c2a7a9d56fd00f478bb931e4daf76684108","author":{"email":"237d99e890afdf89ab33e55175b95c69109c7e7a@naver.com","name":"js4hyun"},"message":"젠포인트 이미지변경\n\n하지만 위치조정 필요","distinct":false,"url":"https://api.github.com/repos/LeeJiu/teamportfolio_disgaea/commits/53589c2a7a9d56fd00f478bb931e4daf76684108"},{"sha":"96cb9b7c9b66c6583fe7d6da34d8a8121779956b","author":{"email":"237d99e890afdf89ab33e55175b95c69109c7e7a@naver.com","name":"js4hyun"},"message":"Merge remote-tracking branch 'refs/remotes/origin/jihyun' into development","distinct":true,"url":"https://api.github.com/repos/LeeJiu/teamportfolio_disgaea/commits/96cb9b7c9b66c6583fe7d6da34d8a8121779956b"}]}