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