Resolved merge conflict.
authorManoj K <manoj.k@zyxware.com>
Tue, 21 Oct 2014 11:23:47 +0000 (16:53 +0530)
committerManoj K <manoj.k@zyxware.com>
Tue, 21 Oct 2014 11:23:47 +0000 (16:53 +0530)
commit2a3888e3802f0737017d50ba4eec497adfbb4aef
treebf0fbd72e2a7746abfcfc5be7b1dffa3c41a9a5c
parent2575ba7d23532356bf230819152c9302db875120
parent64276c2d305576373e9715fc99f9a4326999e886
Resolved merge conflict.
CRM/Wci/Form/CreateWidget.php
extern/wciwidget.php
templates/CRM/Wci/Page/wciwidget.tpl