fix up merge issue
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0dfb04b8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0dfb04b8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0dfb04b8 Branch: refs/heads/tlf Commit: 0dfb04b806f597cc05b19527b4b0060be17c05d0 Parents: 1d68cd8 Author: Alex Harui <[email protected]> Authored: Mon Jun 26 11:11:08 2017 -0700 Committer: Alex Harui <[email protected]> Committed: Mon Jun 26 11:11:08 2017 -0700 ---------------------------------------------------------------------- .../Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0dfb04b8/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as index 7f21708..f5d71ca 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as @@ -709,7 +709,6 @@ package org.apache.flex.core cssString += "}"; ss.insertRule(cssString, ss.cssRules.length); } ->>>>>>> release0.8.0 } COMPILE::JS
