{"push_id":1336690013,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"63e503adfa9d096b15fa98653b53d16e7aae9790","before":"8b4a5e4fc704ddbb164d81c3db9921a2fe0fcf63","commits":[{"sha":"8386c96eeba29af089b27fb5c7e22b95120cbe8e","author":{"name":"Angel Oterino","email":"6e9492401d278d1449d0a93f3ad7f72860eba158@gmail.com"},"message":"OK","distinct":true,"url":"https://api.github.com/repos/angeloterino/Godzilla/commits/8386c96eeba29af089b27fb5c7e22b95120cbe8e"},{"sha":"63e503adfa9d096b15fa98653b53d16e7aae9790","author":{"name":"Angel Oterino","email":"6e9492401d278d1449d0a93f3ad7f72860eba158@gmail.com"},"message":"Merge branch 'master' of https://github.com/angeloterino/Godzilla\n\n# Conflicts:\n#\tScripts/customBOYJJByChannel.js\n#\tbin/StrawmanApp.dll\n#\tbin/StrawmanApp.pdb\n#\tobj/Debug/AspnetCompileMerge/Source/Content/CustomStyle.css\n#\tobj/Debug/AspnetCompileMerge/Source/Scripts/customMasterData.js\n#\tobj/Debug/AspnetCompileMerge/Source/Views/Config/Users/_ChannelsTabs.cshtml\n#\tobj/Debug/AspnetCompileMerge/Source/Views/Config/_BoyConfigGrid.cshtml\n#\tobj/Debug/AspnetCompileMerge/Source/Views/MarketView/_Market_BOY.cshtml\n#\tobj/Debug/AspnetCompileMerge/Source/Views/MarketView/_Market_PCVSPY.cshtml\n#\tobj/Debug/AspnetCompileMerge/Source/Views/Shared/_Scripts.cshtml\n#\tobj/Debug/AspnetCompileMerge/Source/Views/StrawmanViews/_StrawmanViewSTD.cshtml\n#\tobj/Debug/AspnetCompileMerge/Source/bin/StrawmanApp.dll\n#\tobj/Debug/AspnetCompileMerge/Source/bin/StrawmanApp.pdb\n#\tobj/Debug/AspnetCompileMerge/Source/bin/StrawmanDBLibray.dll\n#\tobj/Debug/AspnetCompileMerge/Source/bin/StrawmanDBLibray.pdb\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/Content/CustomStyle.css\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/Scripts/customMasterData.js\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/Views/Config/Users/_ChannelsTabs.cshtml\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/Views/Config/_BoyConfigGrid.cshtml\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/Views/MarketView/_Market_BOY.cshtml\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/Views/MarketView/_Market_PCVSPY.cshtml\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/Views/Shared/_Scripts.cshtml\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/Views/StrawmanViews/_StrawmanViewSTD.cshtml\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/bin/App_global.asax.dll\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/bin/StrawmanApp.dll\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/bin/StrawmanApp.pdb\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/bin/StrawmanDBLibray.dll\n#\tobj/Debug/AspnetCompileMerge/TempBuildDir/bin/StrawmanDBLibray.pdb\n#\tobj/Debug/Package/PackageTmp/Content/CustomStyle.css\n#\tobj/Debug/Package/PackageTmp/Content/Gridmvc.css\n#\tobj/Debug/Package/PackageTmp/Scripts/customMasterData.js\n#\tobj/Debug/Package/PackageTmp/Scripts/customUserManagment.js\n#\tobj/Debug/Package/PackageTmp/Views/BrandView/_Brand_BOY.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/BrandView/_Brand_BTG.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/BrandView/_Brand_MAT.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/BrandView/_Brand_Month.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/BrandView/_Brand_PCVSPY.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/BrandView/_Brand_YTD.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/Config/Users/_ChannelsTabs.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/Config/_BoyConfigGrid.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/MarketView/_Market_BOY.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/MarketView/_Market_PCVSPY.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/Shared/_Scripts.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/StrawmanViews/_StrawmanViewFranchiseSTD.cshtml\n#\tobj/Debug/Package/PackageTmp/Views/StrawmanViews/_StrawmanViewSTD.cshtml\n#\tobj/Debug/Package/PackageTmp/bin/App_global.asax.dll\n#\tobj/Debug/Package/PackageTmp/bin/StrawmanApp.dll\n#\tobj/Debug/Package/PackageTmp/bin/StrawmanApp.pdb\n#\tobj/Debug/Package/PackageTmp/bin/StrawmanDBLibray.dll\n#\tobj/Debug/Package/PackageTmp/bin/StrawmanDBLibray.pdb\n#\tobj/Debug/StrawmanApp.dll\n#\tobj/Debug/StrawmanApp.pdb","distinct":true,"url":"https://api.github.com/repos/angeloterino/Godzilla/commits/63e503adfa9d096b15fa98653b53d16e7aae9790"}]}
{"actor":{"display_login":"angeloterino"}}