Fix incorrect conlfict resolution
authorMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 10 Mar 2010 17:32:18 +0000 (12:32 -0500)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 10 Mar 2010 17:32:18 +0000 (12:32 -0500)
commitcfd7bed91436a06d9883599e7fb4380c66c9f0f1
tree277c376c5cde66488e44d7ba22218613adcbceab
parent270e95e88f59d6bc245b8da2c8855cdd88b96eca
Fix incorrect conlfict resolution
kronolith/js/kronolith.js