fix global plugin test after merge

Author: David Verholen

tests/MagentoHackathon/Composer/Magento/FullStack/GlobalPluginTest.php

@@ -31,11 +31,7 @@ protected function prepareCleanDirectories()
     public function testGlobalInstall()
     {
         $process = new Process(
-<<<<<<< HEAD
             self::getComposerCommand().' global install ' . self::getComposerArgs(),
-=======
-            self::getComposerCommand().' global install',
->>>>>>> f6e6c2c58d5298e4f1388109ae09eec97482cd63
             self::getProjectRoot()
         );
         $process->setEnv( array('COMPOSER_HOME'=>self::getBasePath().'/home'));
@@ -48,21 +44,12 @@ public function testGlobalUpdate()
     {
 
         $process = new Process(
-<<<<<<< HEAD
             self::getComposerCommand().' global update ' . self::getComposerArgs(),
-=======
-            self::getComposerCommand().' global update',
->>>>>>> f6e6c2c58d5298e4f1388109ae09eec97482cd63
             self::getProjectRoot()
         );
         $process->setEnv( array('COMPOSER_HOME'=>self::getBasePath().'/home'));
 
         $process->run();
         $this->assertProcess($process);
     }
-
-<<<<<<< HEAD
-}
-=======
 }
->>>>>>> f6e6c2c58d5298e4f1388109ae09eec97482cd63