Merge remote-tracking branch 'origin/master'

Gummibeer · Gummibeer · commit 410d849c02de · 2018-12-05T12:22:48.000+01:00
diff --git a/src/Libs/OptionsResolver.php b/src/Libs/OptionsResolver.php
@@ -2,9 +2,9 @@
 
 namespace Curlyspoon\Cms\Libs;
 
-use Curlyspoon\NestedOptionsResolver\OptionsResolver as CurlyspoonOptionsResolver;
 use Illuminate\Container\Container;
 use Curlyspoon\Cms\Contracts\NormalizerManager as NormalizerManagerContract;
+use Curlyspoon\NestedOptionsResolver\OptionsResolver as CurlyspoonOptionsResolver;
 
 class OptionsResolver extends CurlyspoonOptionsResolver
 {

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Curlyspoon\Cms\Libs;`
`4`	`4`
`5`		`-use Curlyspoon\NestedOptionsResolver\OptionsResolver as CurlyspoonOptionsResolver;`
`6`	`5`	`use Illuminate\Container\Container;`
`7`	`6`	`use Curlyspoon\Cms\Contracts\NormalizerManager as NormalizerManagerContract;`
	`7`	`+use Curlyspoon\NestedOptionsResolver\OptionsResolver as CurlyspoonOptionsResolver;`
`8`	`8`
`9`	`9`	`class OptionsResolver extends CurlyspoonOptionsResolver`
`10`	`10`	`{`