[Opensc-commits] [OpenSC/OpenSC] 97ebc0: Incorrect merge resolution

[Martin P. <no...@gi...>]

  Branch: refs/heads/esteid-2018
  Home:   https://github.com/OpenSC/OpenSC
  Commit: 97ebc0e2cfdd6b93d755b1835096afa66e77b6e7
      https://github.com/OpenSC/OpenSC/commit/97ebc0e2cfdd6b93d755b1835096afa66e77b6e7
  Author: Martin Paljak <ma...@ma...>
  Date:   2019-03-16 (Sat, 16 Mar 2019)

  Changed paths:
    M src/libopensc/pkcs15-syn.h

  Log Message:
  -----------
  Incorrect merge resolution

Change-Id: I2d36f50bda44fd3295908fc7b3fb2a4717f453b5