TASK: Adjust version constraint to make this usable with dev-master

mficzel · web-flow · commit 1d4f84120c40 · 2017-07-07T14:05:53.000+02:00
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "neos/fusion": "^3.2.0|dev-master",
+        "neos/fusion": "^3.2.0 || dev-master",
         "sebastian/diff": "~1.2"
     },
     "autoload": {
@@ -24,4 +24,4 @@
             "package-key": "PackageFactory.FusionDslExplorer"
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`}`
`12`	`12`	`],`
`13`	`13`	`"require": {`
`14`		`- "neos/fusion": "^3.2.0\|dev-master",`
	`14`	`+ "neos/fusion": "^3.2.0 \|\| dev-master",`
`15`	`15`	`"sebastian/diff": "~1.2"`
`16`	`16`	`},`
`17`	`17`	`"autoload": {`
`@@ -24,4 +24,4 @@`
`24`	`24`	`"package-key": "PackageFactory.FusionDslExplorer"`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`-}`
	`27`	`+}`