fixes merge failure (missing braces)
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Dec 2014 15:06:00 +0000 (16:06 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Dec 2014 15:06:00 +0000 (16:06 +0100)
commitb3a0d82d48677e343f10f62ea04b32ae264e9820
tree35a6dd62e5027c36a263a3e188efe2b79a6ac72c
parent44b7bbb903d172cdb3bb6efeb8bba6f822251bc3
fixes merge failure (missing braces)
tine20/Tinebase/Config.php