resolve merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/ce6e3ffb Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/ce6e3ffb Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/ce6e3ffb Branch: refs/heads/develop Commit: ce6e3ffb3825e30564c0190a036d0e2ec575c155 Parents: e381d6b 939c9d3 Author: Justin Mclean <[email protected]> Authored: Sun Mar 16 11:58:07 2014 +1100 Committer: Justin Mclean <[email protected]> Committed: Sun Mar 16 11:58:07 2014 +1100 ---------------------------------------------------------------------- ----------------------------------------------------------------------
