Branch: refs/heads/master-bsc-1164547-b Home: https://github.com/yast/yast-ntp-client Commit: 7dba097ebb3d253a3f56a904be5b1ef7caa953f2 https://github.com/yast/yast-ntp-client/commit/7dba097ebb3d253a3f56a904be5b1... Author: Stefan Schubert <schubi@suse.de> Date: 2020-03-19 (Thu, 19 Mar 2020) Changed paths: M src/clients/ntp-client_proposal.rb Log Message: ----------- merge errors