{"push_id":632726592,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"b471348c737db0a5cc9fb7a78312b9eff3d8942c","before":"163c4672413efde98da112437a7a7ca0693e3999","commits":[{"sha":"39e702799884e5f51c1780de7ed80a32d2c878a2","author":{"email":"27f78ef059617b527e15ce0fe6ec7aaf52b7954a@gmail.com","name":"Nick Miethe"},"message":"Final? asteroid","distinct":true,"url":"https://api.github.com/repos/brianbollerman/NationBuilders/commits/39e702799884e5f51c1780de7ed80a32d2c878a2"},{"sha":"c64d75531d4c74bda080049e9eca30143d57d4bd","author":{"email":"27f78ef059617b527e15ce0fe6ec7aaf52b7954a@gmail.com","name":"Nick Miethe"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tLibrary/InspectorExpandedItems.asset\n\tLibrary/ScriptAssemblies/Assembly-CSharp-Editor.dll\n\tLibrary/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n\tLibrary/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n\tLibrary/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n\tLibrary/ScriptAssemblies/Assembly-CSharp.dll\n\tLibrary/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tLibrary/assetDatabase3\n\tLibrary/guidmapper\n\tLibrary/metadata/00/00000000000000004000000000000000\n\tLibrary/metadata/76/767edb027a0434e7d871b16c8b0969e5\n\tTemp/__EditModeScene","distinct":true,"url":"https://api.github.com/repos/brianbollerman/NationBuilders/commits/c64d75531d4c74bda080049e9eca30143d57d4bd"},{"sha":"b471348c737db0a5cc9fb7a78312b9eff3d8942c","author":{"email":"27f78ef059617b527e15ce0fe6ec7aaf52b7954a@gmail.com","name":"Nick Miethe"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tLibrary/InspectorExpandedItems.asset\n\tLibrary/ScriptAssemblies/Assembly-CSharp-Editor.dll\n\tLibrary/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n\tLibrary/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n\tLibrary/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n\tLibrary/ScriptAssemblies/Assembly-CSharp.dll\n\tLibrary/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tLibrary/assetDatabase3\n\tLibrary/guidmapper\n\tLibrary/metadata/00/00000000000000004000000000000000\n\tLibrary/metadata/76/767edb027a0434e7d871b16c8b0969e5\n\tTemp/__EditModeScene","distinct":true,"url":"https://api.github.com/repos/brianbollerman/NationBuilders/commits/b471348c737db0a5cc9fb7a78312b9eff3d8942c"}]}