[SCM] gsequencer/upstream: merge conflict

[jkraehemann-guest at users.alioth.debian.org]

New upstream version 1.3.6
New upstream version 1.3.5
New upstream version 1.3.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: d1c948e4f0f84763892169e99329124bbbb39101
X-Git-Newrev: ba2015d113a2d209610855b3cacf14d38a801166

The following commit has been merged in the upstream branch:
commit ba2015d113a2d209610855b3cacf14d38a801166
Merge: c36f1f78b4e6ac12e17d013af53050091250e247 d1c948e4f0f84763892169e99329124bbbb39101
Author: Joël Krähemann <jkraehemann at gmail.com>
Date:   Tue Jan 16 15:18:29 2018 +0100

    merge conflict


-- 
gsequencer packaging