Resolved merge conflict.
[com.zyxware.civiwci.git] / extern /
drwxr-xr-x   ..
-rw-r--r-- 2952 wciwidget.php