revert another incorrect conflict resolution
authorMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 10 Mar 2010 18:04:28 +0000 (13:04 -0500)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Wed, 10 Mar 2010 18:04:28 +0000 (13:04 -0500)
commitd45b8f75f4fc141beafc187061dacec46a99aa8f
treeaf24253188705276d1a3daaf8951eda3533e9ec3
parent87b562b29191c4cf84ad0913da453af1c8caba1e
revert another incorrect conflict resolution
kronolith/js/kronolith.js