Merge pull request laravel#2421 from tmalecki/fix-workbench-stubs-composer-json

taylorotwell · taylorotwell · commit 54fb4d2d4d1c · 2013-10-06T16:53:31.000-07:00
Fix Workbench/stubs/composer.json
diff --git a/src/Illuminate/Workbench/stubs/composer.json b/src/Illuminate/Workbench/stubs/composer.json
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
     "name": "{{lower_vendor}}/{{lower_name}}",
     "description": "",
