summaryrefslogtreecommitdiff
path: root/javastroke
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2017-04-29 12:56:59 +0200
committerMattia Rizzolo <mattia@debian.org>2017-04-29 12:56:59 +0200
commit8b8e914e7ac79f05cd72a8ef2f373c1df8695984 (patch)
tree07ba251cef23b36797cf086f1c0f7d9ef0d1fd29 /javastroke
parent45467d79119285e5c9d7b86799db3ffbfb0785f0 (diff)
Rid of old Conflicts
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
Diffstat (limited to 'javastroke')
0 files changed, 0 insertions, 0 deletions