! Fixing merge

app/code/community/EcomDev/PHPUnit/Test/Listener.php

@@ -59,6 +59,8 @@ class EcomDev_PHPUnit_Test_Listener implements PHPUnit_Framework_TestListener
                 $this->getAppReflection()->getMethod('applyTestScope')->invoke(null);
             }
 
+
+
             $this->firstLevelTestSuite = $suite;
             Mage::dispatchEvent('phpunit_suite_start_after', array(
                 'suite' => $suite,

app/code/community/EcomDev/PHPUnitTest/Test/Lib/Helper.php

 <?php
+
 /**
  * PHP Unit test suite for Magento
  *

app/code/community/EcomDev/PHPUnitTest/Test/Lib/Mock/Proxy.php

@@ -147,4 +147,5 @@ class EcomDev_PHPUnitTest_Test_Lib_Mock_Proxy extends PHPUnit_Framework_TestCase
         $this->assertEquals(false, $this->mockProxy->compareValues('value1', 'value2'));
         $this->assertEquals(true, $this->mockProxy->compareValues('value1', 'value1'));
     }
+
 }

lib/EcomDev/PHPUnit/Helper.php

@@ -193,4 +193,4 @@ class EcomDev_PHPUnit_Helper
         });
     }
 
-}
+}
\ No newline at end of file