[sugar-measure: 2/2] merge conflict fixed

Kalpa Welivitigoda callkalpa at fedoraproject.org
Sat Dec 15 05:52:19 UTC 2012


commit e44e3776dacf7be6a6f96aedf06cd55684cf9cb0
Merge: 2ecabce 8920df8
Author: Kalpa Welivitigoda <callkalpa at gmail.com>
Date:   Sat Dec 15 11:21:15 2012 +0530

    merge conflict fixed

---


More information about the scm-commits mailing list