flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pio...@apache.org
Subject [06/10] git commit: [flex-asjs] [refs/heads/feature/FLEX-35328_simplify_mdl_drop_down_list] - fix up merge issue
Date Mon, 26 Jun 2017 20:53:09 GMT
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/feature/FLEX-35328_simplify_mdl_drop_down_list
Commit: 0dfb04b806f597cc05b19527b4b0060be17c05d0
Parents: 1d68cd8
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jun 26 11:11:08 2017 -0700
Committer: Alex Harui <aharui@apache.org>
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


Mime
View raw message