Changeset 408 in tests

Timestamp:

08/04/2011 08:42:06 PM (14 years ago)

Author:

ryan

Message:

Fix merge arrows

File:

• wp-testcase/test_image.php (modified) (1 diff)

wp-testcase/test_image.php

@@ -312 +312 @@
         $out = image_constrain_size_for_editor(64, 64, 'full');
         $this->assertEquals(array(64, 64), $out);
-<<<<<<< .mine
-
-=======
->>>>>>> .r406
     }