{"shas":[["dca6aaf66d1849ee73a862c483064015a88bb67e","134337f9524e8ed6a1684354ec143e296c90aca6@gmail.com","Merge branch 'master' of github.com:smacdo/assettool\n\nConflicts:\n\tsrc/scott/assettool/ObjReader.java\n\nMerged ff dev to laptop","Scott MacDonald"]],"repo":"smacdo/assettool","actor":"smacdo","ref":"refs/heads/master","size":1,"head":"dca6aaf66d1849ee73a862c483064015a88bb67e","actor_gravatar":"5f68e9ba2f99deba25b1a2f8a05d0e28","push_id":26317664}