Merge pull request #176 from Flowpack/johannessteu-patch-1

dfeyer · web-flow · commit 910cf0c28605 · 2017-02-01T12:21:15.000+01:00
TASK: Set correct dependency to neos/fluid-adaptor
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "flowpack/elasticsearch": "~2.0 || dev-master",
         "neos/content-repository-search": "~3.0 || dev-master",
         "neos/flow": "~4.0 || dev-master",
-        "neos/fluid-adaptor": "~1.0 || dev-master"
+        "neos/fluid-adaptor": "~4.0 || dev-master"
     },
     "autoload": {
         "psr-4": {
@@ -82,4 +82,4 @@
             "Neos.ContentRepository.Search-20161210231100"
         ]
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"flowpack/elasticsearch": "~2.0 \|\| dev-master",`
`12`	`12`	`"neos/content-repository-search": "~3.0 \|\| dev-master",`
`13`	`13`	`"neos/flow": "~4.0 \|\| dev-master",`
`14`		`- "neos/fluid-adaptor": "~1.0 \|\| dev-master"`
	`14`	`+ "neos/fluid-adaptor": "~4.0 \|\| dev-master"`
`15`	`15`	`},`
`16`	`16`	`"autoload": {`
`17`	`17`	`"psr-4": {`
`@@ -82,4 +82,4 @@`
`82`	`82`	`"Neos.ContentRepository.Search-20161210231100"`
`83`	`83`	`]`
`84`	`84`	`}`
`85`		`-}`
	`85`	`+}`