Fix merge leftover artifact

MaStr · MaStr · commit 368331bd08ae · 2016-06-14T19:54:51.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,5 @@
 CHANGELOG
 
-<<<<<<< HEAD
 === 1.1.0 ===
 * [New] Enable / Disable file provisioning for custom lighttpd directory listing
 * [New] ChatBox message is now in conf/chat_init.txt 
