Yeah that's weird. very minor merge differences. little things like a </p> and some versioning changes on the ASDOC comments. I'll correct them and get them back up.
On Fri, Apr 19, 2013 at 9:48 PM, Justin Mclean <[email protected]>wrote: > Hi, > > Think you may of overwrote some (minor) existing changes to Grid.as. Git > merge issue? > > Double check the diffs on the comments - probably mean ASDocs generation > is broken. > > > https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git;a=blobdiff;f=frameworks/projects/spark/src/spark/components/Grid.as;h=320a34fed0ac32700afdf7a6f95852478d10c5f6;hp=02c71b3c2bf1674ecb883ef0c4d880c565032a47;hb=774cdd7b68759fcc93b40f8854de86824c6e4a97;hpb=531f7f2fe7aa72fa3c998d76c2de7b9b1761ee03 > > Thanks > Justin
