Fix test title

diff --git a/ext/standard/tests/array/sort_object2.phpt b/ext/standard/tests/array/sort_object2.phpt
index 2db9e2e70cddc77ef9fae7e0e6b2208a6275fb2c..9ccc9496cf3398855c06c7fb062a724846984f55 100644 (file)
--- a/ext/standard/tests/array/sort_object2.phpt
+++ b/ext/standard/tests/array/sort_object2.phpt
@@ -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] )