[Opensc-commits] [OpenSC/OpenSC] 634e96: in case of conflicts, add "our" changes on top

[Frank M. <no...@gi...>]

  Branch: refs/heads/arm64
  Home:   https://github.com/OpenSC/OpenSC
  Commit: 634e963adcf1a4f88bb81c72d3b2067dbeb646ea
      https://github.com/OpenSC/OpenSC/commit/634e963adcf1a4f88bb81c72d3b2067dbeb646ea
  Author: Frank Morgner <fra...@gm...>
  Date:   2021-03-04 (Thu, 04 Mar 2021)

  Changed paths:
    M .github/push_artifacts.sh

  Log Message:
  -----------
  in case of conflicts, add "our" changes on top