Minor correction for cs-17682. [ZF-7581]

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17688 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/Gdata/HealthOnlineTest.php

@@ -1,4 +1,3 @@
-<<<<<<< .working
 <?php
 /**
  * Zend Framework