mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 17:31:11 +02:00
ffb81abcb1
fix a merge error introduced during the twin merge (correct code was in commtaf6edcdc68) Origin commit data ------------------ Branch: ni/coolstream Commit:7a4e58e44fAuthor: Stefan Seyfried <seife@tuxbox-git.slipkontur.de> Date: 2012-09-16 (Sun, 16 Sep 2012) Origin message was: ------------------ channellist: fix parental locking fix a merge error introduced during the twin merge (correct code was in commtaf6edcdc68) ------------------ This commit was generated by Migit
The file is empty.