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

2019-11-01 Thread Christoph Feck
cfeck closed this task as "Resolved". cfeck claimed this task. cfeck added a comment. Duplicate of https://phabricator.kde.org/T11960 TASK DETAIL https://phabricator.kde.org/T11958 To: cfeck Cc: aacid, #okular, cfeck, sysadmin, duffus

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

2019-11-01 Thread Albert Astals Cid
aacid added a comment. Oh sorry didn't realize you had created one already i created https://phabricator.kde.org/T11960 with what i think would be a more complete solution TASK DETAIL https://phabricator.kde.org/T11958 To: aacid Cc: aacid, #okular, cfeck, sysadmin, duffus

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

2019-11-01 Thread 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