add conflicts resolution for mono 50/100950/1
authorHyungGi Lee <hyunggi.lee@samsung.com>
Wed, 30 Nov 2016 02:18:36 +0000 (11:18 +0900)
committerHyungGi Lee <hyunggi.lee@samsung.com>
Wed, 30 Nov 2016 02:18:36 +0000 (11:18 +0900)
commit3e8b9012c6c1f2811879a20b0e48cf48e9756384
tree31f49f7261d1398510b4d8d28ee08bee1f98a755
parent88c4359d89d1c4c9561bc465cd55ac63e7db1d3c
add conflicts resolution for mono

Change-Id: I3cdb1d75b2ad8dc83e11a885199c27fda83d4cd4
Tizen:Base/_config