On 08/02/2015 08:08 PM, spriver wrote: > https://gitlab.com/spriver/tails.git > branch: de_tor_browser
> latest commit: f4199a8 Several edit's and corrections well, i think we've waited too long and now i get a conflict when trying
to merge the branch into the current master... spriver, if its not too
much to ask, could you rebase the branch on current master?