[Gnash-commit] /srv/bzr/gnash/trunk r10981: Fixed weird AntiAliasType_as.hx, don't know how it got reverted

[Bob Naugle]

------------------------------------------------------------
revno: 10981
committer: Bob Naugle <address@hidden>
branch nick: trunk
timestamp: Wed 2009-06-03 09:52:07 -0600
message:
  Fixed weird AntiAliasType_as.hx, don't know how it got reverted
modified:
  testsuite/as3/classes.all/text/AntiAliasType_as.hx

=== modified file 'testsuite/as3/classes.all/text/AntiAliasType_as.hx'
--- a/testsuite/as3/classes.all/text/AntiAliasType_as.hx        2009-06-03 
15:32:04 +0000
+++ b/testsuite/as3/classes.all/text/AntiAliasType_as.hx        2009-06-03 
15:52:07 +0000
@@ -26,12 +26,6 @@
 #if flash9
 import flash.text.AntiAliasType;
 import flash.display.MovieClip;
-<<<<<<< TREE
-=======
-#else
-import flash.TextField;
-import flash.MovieClip;
->>>>>>> MERGE-SOURCE
 #end
 import flash.Lib;
 import Type;