T11958: [Okular] Applications/19.08 branch contains master commits

[Christoph Feck]

cfeck created this task.
cfeck triaged this task as "High" priority.
cfeck added a project: Sysadmin.
Herald added a subscriber: sysadmin.

TASK DESCRIPTION
  It looks like there was a merge in the wrong direction. Locally I see that the 19.08 branch is 2 commits ahead of master, and branched off of 2a8721c221b294427607703d6a7789dadf1e5dc1 <https://phabricator.kde.org/R223:2a8721c221b294427607703d6a7789dadf1e5dc1> which is both in master and 19.08 branch.
  
  It would be nice if this issue could be investigated and resolved over the weekend, because on Monday tars are about to be created from the branch. Raising priority accordingly.

TASK DETAIL
  https://phabricator.kde.org/T11958

To: cfeck
Cc: #okular, cfeck, sysadmin, duffus
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/okular-devel/attachments/20191101/cca1895d/attachment.html>