resolved conflict in ChangeLog

This commit is contained in:
Fred Gleason
2016-04-26 17:00:11 -04:00
2 changed files with 5 additions and 1 deletions

View File

@@ -15098,3 +15098,6 @@
saving and updating logs. (from albanpeigner pull request #42)
* Created modification pointer in voicetracker for better performance
over WAN networks
2016-04-26 Brian McGlynn <brian.mcglynn@geneseemedia.net>
* Updated Cart Scheduler to favor weighted playback for cuts expiring
first following the number of plays