subject:"git commit\: \[flex\-asjs\] \[refs\/heads\/develop\] \- Fix merge error removing support for numeric font size."

Re: git commit: [flex-asjs] [refs/heads/develop] - Fix merge error removing support for numeric font size.

2017-06-29 Thread Alex Harui

That's not a merge error. That code is now in AllCSSValuesImpl and is not needed in SimpleCSSValuesImpl. Please follow the commits. Thanks, -Alex On 6/28/17, 11:20 PM, "jmcl...@apache.org" wrote: >Repository: flex-asjs >Updated Branches: > refs/heads/develop 18992c5fd ->

git commit: [flex-asjs] [refs/heads/develop] - Fix merge error removing support for numeric font size.

2017-06-29 Thread jmclean

Repository: flex-asjs Updated Branches: refs/heads/develop 18992c5fd -> 68f118b1a Fix merge error removing support for numeric font size. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/68f118b1 Tree: