Branch: refs/heads/master Home: https://github.com/yast/yast-dhcp-server Commit: eede4600220c80fdeedb320f9dc3d641050c321f https://github.com/yast/yast-dhcp-server/commit/eede4600220c80fdeedb320f9dc3... Author: Ladislav Slezák <lslezak@suse.cz> Date: 2014-11-14 (Fri, 14 Nov 2014) Changed paths: M Rakefile Log Message: ----------- removed conflict