{"push_id":736099999,"size":12,"distinct_size":12,"ref":"refs/heads/master","head":"5a8bf9d862086c7e94ca3939237b0ba2030c3927","before":"cbf33bdcc30dd0e90340a5c6ebcd772528cd212a","commits":[{"sha":"211431ea594c400465ecafeec01b662a362e3984","author":{"email":"4979cd1b5a665631cb3b70349cd68f43a30df6e0@gmail.com","name":"Alejandro Trelles"},"message":"Changes for Oaxaca\n\nI made several changes and added information for the Oaxaca Conference…","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/211431ea594c400465ecafeec01b662a362e3984"},{"sha":"299a1699f972a4a1aee543d29555b498a132631d","author":{"email":"4979cd1b5a665631cb3b70349cd68f43a30df6e0@gmail.com","name":"Alejandro Trelles"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tpapers/redMexBias04.pdf\n\tpapers/redMexBias04.tex","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/299a1699f972a4a1aee543d29555b498a132631d"},{"sha":"37e3f9eab7835ad562ea2a1f3ece90cd5063f11b","author":{"email":"4979cd1b5a665631cb3b70349cd68f43a30df6e0@gmail.com","name":"Alejandro Trelles"},"message":"Revert \"Merge remote-tracking branch 'origin/master'\"\n\nThis reverts commit 299a1699f972a4a1aee543d29555b498a132631d, reversing\nchanges made to 211431ea594c400465ecafeec01b662a362e3984.","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/37e3f9eab7835ad562ea2a1f3ece90cd5063f11b"},{"sha":"c7b693a3c1cd92f0dbaaba0bae0078940b3c06ba","author":{"email":"4979cd1b5a665631cb3b70349cd68f43a30df6e0@gmail.com","name":"Alejandro Trelles"},"message":"Revert \"Revert \"Merge remote-tracking branch 'origin/master'\"\"\n\nThis reverts commit 37e3f9eab7835ad562ea2a1f3ece90cd5063f11b.","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/c7b693a3c1cd92f0dbaaba0bae0078940b3c06ba"},{"sha":"ec1ee4dc8d84d7d1541e006d7e652561d24acbf5","author":{"email":"4979cd1b5a665631cb3b70349cd68f43a30df6e0@gmail.com","name":"Alejandro Trelles"},"message":"Revert 37e3f9e..c7b693a\n\nThis rolls back to commit 37e3f9eab7835ad562ea2a1f3ece90cd5063f11b.","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/ec1ee4dc8d84d7d1541e006d7e652561d24acbf5"},{"sha":"8844ae1e80e959149fe14303220840a11d00c8b0","author":{"email":"4979cd1b5a665631cb3b70349cd68f43a30df6e0@gmail.com","name":"Alejandro Trelles"},"message":"Changes for Oaxaca\n\nI made changes and added information for the Oaxaca Conference (v2)","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/8844ae1e80e959149fe14303220840a11d00c8b0"},{"sha":"a7ff39b954154215c43067a523799c247ab084f6","author":{"email":"62c1a4cada64337998ecc58ffcdba9a0714ab0ee@gmail.com","name":"emagar"},"message":"Resolving differences with Trelles merge for Oaxaca","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/a7ff39b954154215c43067a523799c247ab084f6"},{"sha":"cd4f6bef934e0d67a7a295c82006d65c0aa07f11","author":{"email":"62c1a4cada64337998ecc58ffcdba9a0714ab0ee@gmail.com","name":"emagar"},"message":"Resolved conflicts that arose when Eric and Alejandro made simultaneous edit to the paper for Oaxaca conference","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/cd4f6bef934e0d67a7a295c82006d65c0aa07f11"},{"sha":"c45c5b2f1412ef9459570915269a70aee9e3dfa8","author":{"email":"62c1a4cada64337998ecc58ffcdba9a0714ab0ee@gmail.com","name":"emagar"},"message":"Another step towards conflict resolution","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/c45c5b2f1412ef9459570915269a70aee9e3dfa8"},{"sha":"80bbaeddba3e6617154ae7993e71d54439108a5b","author":{"email":"62c1a4cada64337998ecc58ffcdba9a0714ab0ee@gmail.com","name":"emagar"},"message":"Another intermediate step towards conflict resolution","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/80bbaeddba3e6617154ae7993e71d54439108a5b"},{"sha":"d18a0dd958ce7fbf349305e6232d9c09da93fe30","author":{"email":"62c1a4cada64337998ecc58ffcdba9a0714ab0ee@gmail.com","name":"emagar"},"message":"Merge branch 'master' into resolveConflicts","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/d18a0dd958ce7fbf349305e6232d9c09da93fe30"},{"sha":"5a8bf9d862086c7e94ca3939237b0ba2030c3927","author":{"email":"62c1a4cada64337998ecc58ffcdba9a0714ab0ee@gmail.com","name":"emagar"},"message":"Conflicts between Alejandro/Eric commits resolved for Oaxaca conference","distinct":true,"url":"https://api.github.com/repos/emagar/mex-open-map/commits/5a8bf9d862086c7e94ca3939237b0ba2030c3927"}]}