GitHub PushEvent at 2014-05-22 00:56:58
Repository: mydmm
Actor: StormrageWang
Payload: {"shas":[["78786b8ea11461c78b1500d0aba6b4573630be62","d53fe16740e0568cd5816f75392ada4d8f4d9d19@gmail.com","solve the Conflicts","StormrageWang",true],["92c76681ce22cfe4f8b82ac19abccdc2e9cc02dd","d53fe16740e0568cd5816f75392ada4d8f4d9d19@gmail.com","Merge branch 'master' of github.com:StormrageWang/mydmm\n\nConflicts:\n\tprojects/com.stormrage.mydmm.server/src/com/stormrage/mydmm/server/actress/task/ActressTask.java\n\tprojects/com.stormrage.mydmm.server/src/com/stormrage/mydmm/server/actress/task/ActressTaskFactory.java\n\tprojects/com.stormrage.mydmm.server/src/com/stormrage/mydmm/server/task/TaskUtils.java","StormrageWang",true]],"size":2,"ref":"refs/heads/master","head":"92c76681ce22cfe4f8b82ac19abccdc2e9cc02dd"}