[mythtv-commits] [MythTV/mythtv] 83e270: mythzmserver: fix merge error after 84e5caebaa

Paul Harrison noreply at github.com
Fri Jul 5 20:18:40 UTC 2019


  Branch: refs/heads/fixes/30
  Home:   https://github.com/MythTV/mythtv
  Commit: 83e27017203abfac6958bd3a6ce3284c372fa2d4
      https://github.com/MythTV/mythtv/commit/83e27017203abfac6958bd3a6ce3284c372fa2d4
  Author: Paul Harrison <pharrison at mythtv.org>
  Date:   2019-07-05 (Fri, 05 Jul 2019)

  Changed paths:
    M mythplugins/mythzoneminder/mythzmserver/zmserver.cpp

  Log Message:
  -----------
  mythzmserver: fix merge error after 84e5caebaa

Refs #13466




More information about the mythtv-commits mailing list