Resolved conflict in active_editor_count yaml file.
authordeclerambaul <fabian.kaelin@gmail.com>
Thu, 7 Jun 2012 03:46:05 +0000 (05:46 +0200)
committerdeclerambaul <fabian.kaelin@gmail.com>
Thu, 7 Jun 2012 03:46:05 +0000 (05:46 +0200)
commitf5d654fdad213fa68713498c85165608c017f487
treede63b87c9fd595ebbe8ecb2d90995187a4a319b0
parent309e89269054ec69770c8a9d066ad73fcb6626dd
parentf80f13b001f135867ba7ff462892688e8e7dc7b0
Resolved conflict in active_editor_count yaml file.