GitHub PushEvent at 2014-08-26 04:04:10
Repository: skyda
Actor: brandann
Payload: {"shas":[["a3f28347c1321ed60275e1e6f78fdf8182d6ce83","81928db892710fc727757ee4d24f6f20f7b276e0@gmail.com","something","Brandan Haertel",true],["c365648c51f86f2a9f9f2a32917b023db3a9de8c","81928db892710fc727757ee4d24f6f20f7b276e0@gmail.com","Merge branch 'master' of https://github.com/brandann/skyda\n\nConflicts:\n\tMap2/Assembly-CSharp-vs.csproj\n\tMap2/Assembly-CSharp.csproj\n\tMap2/Library/CurrentLayout.dwlt\n\tMap2/Library/ScriptAssemblies/Assembly-CSharp.dll\n\tMap2/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tMap2/Library/assetDatabase3\n\tMap2/Library/metadata/07/070517da5b543ad45909c82784f49976\n\tMap2/Library/metadata/1f/1f6d7c85da99767419338996d9006b28\n\tMap2/Library/metadata/21/21583ff65b3aac14da5237040de1ec17\n\tMap2/Library/metadata/88/8878095493b9d104298e6441ce081de1\n\tMap2/Map2-csharp.sln\n\tMap2/Map2.sln\n\tMap2/Map2.userprefs\n\tNew Unity Project/Library/CurrentLayout.dwlt\n\tNew Unity Project/Library/assetDatabase3\n\tNew Unity Project/New Unity Project-csharp.sln\n\tNew Unity Project/New Unity Project.sln","Brandan Haertel",true]],"size":2,"ref":"refs/heads/master","head":"c365648c51f86f2a9f9f2a32917b023db3a9de8c"}