Resolved merge conflict.
authorManoj K <manoj.k@zyxware.com>
Mon, 3 Nov 2014 04:04:25 +0000 (09:34 +0530)
committerManoj K <manoj.k@zyxware.com>
Mon, 3 Nov 2014 04:04:25 +0000 (09:34 +0530)
commit63c7c4a7875e0124ad60a39a9f9daebf720616ff
treef982391621a3710f547f84ccb4ab655a9e637e9f
parent29c36180d8ae3df1e0e99be094f70b372a45812c
parent75e018d9174aeb87579b7991bf8353de965d44d0
Resolved merge conflict.
CRM/Wci/Form/CreateWidget.php
templates/CRM/Wci/Page/wciwidget.tpl