[aqualung/f24: 7/7] Update to 1.0-0.6.rc1git72c1ab1
commit ad8fdd8b9bf16cf1ef3d6638d26eaa20d536a7cc
Merge: 6d308ed 2b23b4d
Author: Martin Gansser <mgansser(a)alice.de>
Date: Mon Jan 2 19:54:57 2017 +0100
Update to 1.0-0.6.rc1git72c1ab1
.gitignore | 4 ++++
aqualung.spec | 18 +++++++++++++++---
sources | 2 +-
3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index a043d00,1ff5a3f..96ca6d1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,6 @@@
aqualung-export-r1309.tar.bz2
/aqualung-05dfcb7.tar.gz
++<<<<<<< HEAD
++=======
+ /aqualung-72c1ab1.tar.gz
++>>>>>>> master