Fix Workbench/stubs/composer.json

Tomasz Małecki · Tomasz Małecki · commit 1c3f4464526d · 2013-10-06T16:47:12.000+02:00
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": "",
