Commit28ee41c

committed

using array_merge instead of '+' to merge arrays

1 parentfe3683a commit28ee41cCopy full SHA for 28ee41c

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// Join ICEcoder settings and user settings together to make our final ICEcoder array`
`85`		`-$ICEcoder =$ICEcoderSettings+$ICEcoderUserSettings;`
	`85`	`+$ICEcoder =array_merge($ICEcoderSettings,$ICEcoderUserSettings);`
`86`	`86`
`87`	`87`	`// Include language file`
`88`	`88`	`// Load base first as foundation`

Comments

(0)