fix global plugin test after merge

David Verholen · David Verholen · commit 107b568a56dc · 2014-07-04T16:21:51.000+02:00
diff --git a/tests/FullStackTest/home/composer.json b/tests/FullStackTest/home/composer.json
@@ -13,10 +13,5 @@
         "magento-hackathon/magento-composer-installer": "*"
     },
     "extra": {
-<<<<<<< HEAD
-        "magento-root-dir": "root"
-=======
-
->>>>>>> f6e6c2c58d5298e4f1388109ae09eec97482cd63
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,5 @@`
`13`	`13`	`"magento-hackathon/magento-composer-installer": "*"`
`14`	`14`	`},`
`15`	`15`	`"extra": {`
`16`		`-<<<<<<< HEAD`
`17`		`- "magento-root-dir": "root"`
`18`		`-=======`
`19`		`-`
`20`		`->>>>>>> f6e6c2c58d5298e4f1388109ae09eec97482cd63`
`21`	`16`	`}`
`22`	`17`	`}`