fix windows branch conflicts

Makefile

@@ -4,7 +4,6 @@ PROJECT_VERSION = 2.1.0
 
 DEPS = goldrush gproc lager esockd mochiweb pbkdf2 lager_syslog
 
-
 dep_goldrush     = git https://github.com/basho/goldrush 0.1.9
 dep_gproc        = git https://github.com/uwiger/gproc
 dep_getopt       = git https://github.com/jcomellas/getopt v0.8.2
@@ -14,6 +13,7 @@ dep_mochiweb     = git https://github.com/emqtt/mochiweb
 dep_pbkdf2       = git https://github.com/emqtt/pbkdf2 2.0.1
 dep_lager_syslog = git https://github.com/basho/lager_syslog
 
+
 ERLC_OPTS += +'{parse_transform, lager_transform}'
 
 NO_AUTOPATCH = cuttlefish

etc/emq.conf

@@ -63,12 +63,6 @@ log.dir = {{ platform_log_dir }}
 ## Console log. Enum: off, file, console, both
 log.console = console
 
-## Syslog. Enum: on, off
-log.syslog = on
-
-##  syslog level. Enum: debug, info, notice, warning, error, critical, alert, emergency
-log.syslog.level = error
-
 ## Console log level. Enum: debug, info, notice, warning, error, critical, alert, emergency
 log.console.level = error
 

priv/emq.schema

@@ -234,7 +234,7 @@ end}.
       both -> [ConsoleHandler, ConsoleFileHandler];
       _ -> []
     end,
-
+   
     SyslogHandler = case cuttlefish:conf_get("log.syslog", Conf) of
       false -> [];
       true  -> [{lager_syslog_backend,