{"push_id":1087460765,"size":2,"distinct_size":1,"ref":"refs/heads/master","head":"855abfff226d4204259e7828a05ec07bbc6134b3","before":"bb7dc0cd74663267f13103e6d026477a71f329d3","commits":[{"sha":"a2224dd1823b750a7af13a357394f95ebbbd3eb4","author":{"email":"bd45808a12ba5d0b91d16f656174245ebdfebe48@naver.com","name":"sinsungeun"},"message":"마스터 병합","distinct":false,"url":"https://api.github.com/repos/Eunryu/popo/commits/a2224dd1823b750a7af13a357394f95ebbbd3eb4"},{"sha":"855abfff226d4204259e7828a05ec07bbc6134b3","author":{"email":"bd45808a12ba5d0b91d16f656174245ebdfebe48@naver.com","name":"sinsungeun"},"message":"Merge branch 'master' of github.com:Eunryu/popo\n\nConflicts:\n\tPopo/app/src/main/AndroidManifest.xml\n\tPopo/app/src/main/java/com/instru93/eunryu/popo/timetable/TimeTableMainActivity.java\n\tPopo/app/src/main/java/com/instru93/eunryu/popo/timetable/TimetableSchoolHourActivity.java\n\tPopo/app/src/main/res/layout/activity_timetable_schoolhour_item.xml\n\tPopo/app/src/main/res/values/strings.xml\n\tPopo/openCVLibrary310/build/generated/source/aidl/debug/org/opencv/engine/OpenCVEngineInterface.java\n\tPopo/openCVLibrary310/build/intermediates/blame/res/androidTest/debug/multi/values.json\n\tPopo/openCVLibrary310/build/intermediates/bundles/debug/classes.jar\n\tPopo/openCVLibrary310/build/intermediates/classes/debug/org/opencv/android/JavaCameraView$1.class\n\tPopo/openCVLibrary310/build/intermediates/classes/debug/org/opencv/android/JavaCameraView$CameraWorker.class\n\tPopo/openCVLibrary310/build/intermediates/classes/debug/org/opencv/android/JavaCameraView.class\n\tPopo/openCVLibrary310/build/intermediates/incremental/compileDebugAidl/dependency.store\n\tPopo/openCVLibrary310/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml\n\tPopo/openCVLibrary310/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml\n\tPopo/openCVLibrary310/build/intermediates/incremental/mergeDebugAssets/merger.xml\n\tPopo/openCVLibrary310/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml\n\tPopo/openCVLibrary310/build/intermediates/incremental/packageDebugResources/merger.xml\n\tPopo/openCVLibrary310/build/intermediates/res/resources-debug-androidTest.ap_\n\tPopo/openCVLibrary310/build/outputs/aar/openCVLibrary310-debug.aar","distinct":true,"url":"https://api.github.com/repos/Eunryu/popo/commits/855abfff226d4204259e7828a05ec07bbc6134b3"}]}