GitHub PushEvent at 2014-11-19 19:51:47
Repository: EE363_ProjectOne
Actor: emersocj
Payload: {"shas":[["6d47e7cc33b382d47c1cef4928aa84e70d7e0f35","581ffe2d73d294c21c4d93f9896059a06f0a9efa@clarkson.edu","Test Cases","Cody Emerson",true],["c59b406684ba902795ff9bd847b846482133427e","581ffe2d73d294c21c4d93f9896059a06f0a9efa@clarkson.edu","Finished","Cody Emerson",true],["c78a72c210198f629e84b1e958ca9fb16b0b27cf","581ffe2d73d294c21c4d93f9896059a06f0a9efa@clarkson.edu","Finished\n\n\n\nMerge remote-tracking branch 'origin/master'\n\nConflicts:\n\tEE363_ProjectOne/src/edu/clarkson/inkawhna/emersocj/fall2014/ee363/projectone/DecoratorTestCases.java\n\tEE363_ProjectOne/src/edu/clarkson/inkawhna/emersocj/fall2014/ee363/projectone/ImplementGame.java\n\tEE363_ProjectOne/src/edu/clarkson/inkawhna/emersocj/fall2014/ee363/projectone/TotalScoringBehavior.java","Cody Emerson",true]],"size":3,"ref":"refs/heads/master","head":"c78a72c210198f629e84b1e958ca9fb16b0b27cf"}