From: Raghubansh Kumar <kraghuba@php.net>
Date: Mon, 5 Nov 2007 16:19:55 +0000 (+0000)
Subject: Fix test title
X-Git-Tag: RELEASE_2_0_0a1~1459
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f39caa6f5bed108eed7c4f72ead2aec443bf865;p=php

Fix test title
---

diff --git a/ext/standard/tests/array/sort_object2.phpt b/ext/standard/tests/array/sort_object2.phpt
index 2db9e2e70c..9ccc9496cf 100644
--- 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] )