commit 6eb1452407bfb2ecd9947e323b1f2bca10f44e57 Merge: c3a275e 20d3291 Author: Martin Gansser <mgansser(a)alice.de&gt; Date: Fri Sep 9 20:44:04 2016 +0200 Update to 9.5.1 .gitignore | 4 ++++ clog | 2 -- girl.spec | 5 ++++- sources | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) --- diff --cc .gitignore index 946ff7d,57e6271..8a1ef0f --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,2 +1,5 @@@ /girl-9.4.0.tar.xz ++<<<<<<< HEAD ++======= + /girl-9.5.1.tar.xz ++>>>>>>> master