GitHub PushEvent at 2014-01-18 09:29:09
Repository: mhacks2014
Actor: weeksling
Payload: {"shas":[["6f2a74f861e51e41c075fc51e3b1eaad34010688","6c2e179ed0f4096e4404bdfb14ca4a95f94822f0@gmail.com","Hopefully this doesn't break anything","Matthew Weeks",true],["aeae7baca0f47c7af96edf63db511065a081c7f0","6c2e179ed0f4096e4404bdfb14ca4a95f94822f0@gmail.com","Merge branch 'master' of https://github.com/matthewmilitante/mhacks2014\nWell fuck\nConflicts:\n\tAndroidManifest.xml\n\tbin/AndroidManifest.xml\n\tbin/classes.dex\n\tbin/classes/com/example/pinly/MainActivity.class\n\tbin/classes/com/example/pinly/R$id.class\n\tbin/classes/com/example/pinly/R$layout.class\n\tbin/classes/com/example/pinly/R$menu.class\n\tbin/classes/com/example/pinly/R$string.class\n\tbin/classes/com/example/pinly/R$style.class\n\tbin/pinly.apk\n\tbin/resources.ap_\n\tgen/com/example/pinly/R.java\n\tsrc/com/example/pinly/MainActivity.java","Matthew Weeks",true]],"size":2,"ref":"refs/heads/master","head":"aeae7baca0f47c7af96edf63db511065a081c7f0"}