Merge branch 'dev'

dmolsen · dmolsen · commit 89dcdae81fde · 2015-02-25T21:54:33.000-05:00
diff --git a/composer.json b/composer.json
@@ -26,12 +26,5 @@
 	"minimum-stability": "dev",
 	"require": {
 		"pattern-lab/styleguidekit-assets-default": "dev-dev"
-	},
-	"extra": {
-		"patternlab": {
-			"config": [
-				{ "styleguideKit": "pattern-lab/styleguidekit-twig-default" }
-			]
-		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,5 @@`
`26`	`26`	`"minimum-stability": "dev",`
`27`	`27`	`"require": {`
`28`	`28`	`"pattern-lab/styleguidekit-assets-default": "dev-dev"`
`29`		`- },`
`30`		`- "extra": {`
`31`		`- "patternlab": {`
`32`		`- "config": [`
`33`		`- { "styleguideKit": "pattern-lab/styleguidekit-twig-default" }`
`34`		`- ]`
`35`		`- }`
`36`	`29`	`}`
`37`	`30`	`}`