Compare commits

..

2 Commits

Author SHA1 Message Date
Simon Sessingø 212ae133de Merge pull request #75 from skipperbent/development
[TASK] Readded merging
2016-03-19 17:40:26 +01:00
Simon Sessingø 438d3c258b [TASK] Readded merging 2016-03-19 17:11:54 +01:00
+1 -1
View File
@@ -202,7 +202,7 @@ abstract class RouterEntry {
*/
public function addSettings(array $settings = null) {
if(is_array($settings)) {
$this->settings = array_merge($settings, $this->settings);
$this->settings = array_merge($this->settings, $settings);
}
return $this;
}