projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f081573
)
Fix merge order.
author
Jan Schneider
<jan@horde.org>
Thu, 19 Nov 2009 00:44:16 +0000
(
01:44
+0100)
committer
Jan Schneider
<jan@horde.org>
Thu, 19 Nov 2009 00:44:16 +0000
(
01:44
+0100)
timeobjects/lib/Driver.php
patch
|
blob
|
history
diff --git
a/timeobjects/lib/Driver.php
b/timeobjects/lib/Driver.php
index
ac14190
..
97f467d
100644
(file)
--- a/
timeobjects/lib/Driver.php
+++ b/
timeobjects/lib/Driver.php
@@
-8,7
+8,7
@@
class TimeObjects_Driver
public function __construct($params)
{
- $this->_params = array_merge($
params, $this->_
params);
+ $this->_params = array_merge($
this->_params, $
params);
}
/**