Formatting

This commit is contained in:
R. Eric Wheeler 2016-07-19 15:04:02 -07:00
parent 441a3970aa
commit 632cbc22bb
1 changed files with 0 additions and 8 deletions

View File

@ -3,15 +3,7 @@
/*
* This file is part of ArrayObjectArray.
*
<<<<<<< HEAD
* (copyleft) R. Eric Wheeler <sikofitt@gmail.com>
=======
* @file ArrayObjectArrayTest.php
*
* R. Eric Wheeler <sikofitt@gmail.com>
*
* 7/19/16 / 1:58 PM
>>>>>>> refs/remotes/origin/master
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.