Resolved merge conflict.
[com.zyxware.civiwci.git] / CRM / Wci / Form /
drwxr-xr-x   ..
-rw-r--r-- 12870 CreateWidget.php
-rw-r--r-- 7345 ProgressBar.php