add conflicts resolution for mono
[scm/meta/obs.git] / Tizen:3.0:TV /
2016-10-28 HyungGi LeeTizen:3.0:Mobile/TV/Wearable/IVI - using Tizen:3.0... 48/94348/1
2016-10-16 Joonsub LeeInitialize Tizen:3.0:Mobie/TV/Wearable/IVI 90/92390/1