{"push_id":2619590018,"size":2,"distinct_size":1,"ref":"refs/heads/feature/server2","head":"9bd273c3f71a38e9ca04be7319a391eaa5557f43","before":"d347c109e43fa1c841b4fdd44bce1c452596955b","commits":[{"sha":"40f83b6a00ee1cb30a5c478afb730e8b22e77522","author":{"name":"Home-HP\\Home","email":"11f618ccc3846e8a81f3c0eac6964491d273c727@gmail.com"},"message":"Product, Disposable 테이블(DAO, Service, Controller 포함) 업데이트\n메인페이지(index.jsp)업데이트","distinct":false,"url":"https://api.github.com/repos/ohseungo/final_project/commits/40f83b6a00ee1cb30a5c478afb730e8b22e77522"},{"sha":"9bd273c3f71a38e9ca04be7319a391eaa5557f43","author":{"name":"ohseugo@laptop","email":"ea2d6103b5549f8733f5d37930b2c40a7e1e3569@gmail.com"},"message":"Merge branch 'feature/server' into feature/server2\n\n# Conflicts:\n#\tserver/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources\n#\tserver/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml\n#\tserver/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi\n#\tserver/.metadata/.plugins/org.eclipse.jdt.core/1356777784.index\n#\tserver/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps\n#\tserver/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt\n#\tserver/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments.gen\n#\tserver/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen\n#\tserver/.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser\n#\tserver/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties\n#\tserver/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml\n#\tserver/.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt\n#\tserver/.metadata/.plugins/org.eclipse.wst.server.core/publish/publish0.dat\n#\tserver/.metadata/.plugins/org.springframework.ide.eclipse.beans.core.metadata/metadata/.state\n#\tserver/.metadata/version.ini\n#\tserver/greenRight_server/src/com/scsa/model/dao/GreenPointDAO.java\n#\tserver/greenRight_server/target/m2e-wtp/web-resources/META-INF/maven/greenRight_server/greenRight_server/pom.properties","distinct":true,"url":"https://api.github.com/repos/ohseungo/final_project/commits/9bd273c3f71a38e9ca04be7319a391eaa5557f43"}]}
{"actor":{"display_login":"ohseungo"}}