kraghuba                Mon Nov  5 16:19:55 2007 UTC

  Modified files:              
    /php-src/ext/standard/tests/array   sort_object2.phpt 
  Log:
  Fix test title
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_object2.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/sort_object2.phpt
diff -u php-src/ext/standard/tests/array/sort_object2.phpt:1.1 
php-src/ext/standard/tests/array/sort_object2.phpt:1.2
--- php-src/ext/standard/tests/array/sort_object2.phpt:1.1      Mon Nov  5 
15:17:10 2007
+++ php-src/ext/standard/tests/array/sort_object2.phpt  Mon Nov  5 16:19:55 2007
@@ -1,9 +1,5 @@
 --TEST--
-<<<<<<< .mine
-Test sort() function : object functionality - sorting objects with diff. 
accessiblity of member vars 
-=======
-Test sort() function : usage variations - sorting objects with diff. 
accessiblity of member vars
->>>>>>> .r17831
+Test sort() function : object functionality - sorting objects with diff. 
accessibility of member vars 
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to