# HG changeset patch # User Klaus Ethgen # Date 1548919514 -3600 # Node ID e3a3b30d724a0afcf9e2c1205426b53194323184 # Parent f9a21c9891a088d7acffe128fcb80187fc020219 Don't include ZoneDetect sources Reverted Colins commit on request. This Commit is just to create a conflict. Do *NOT* merge! `git reset (--hard) origin/master` is the way to go.