Fixed merge conflict
[easylist] / settingsform.cpp
2011-04-29 Elias WoodsAdd allow settings apply button to take effect in curre...
2011-04-29 Elias WoodsAdd better settings management and post existing list...
2011-04-29 Willem LiuAdded sync functionality with website. willemliu.nl...