[shotcut/f26: 3/4] Update to 17.12
commit 1f77e9339244ee918b2fe75037d36f10516fb2f8
Merge: 6b1bde9 d8ea6e3
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Dec 8 15:42:36 2017 +0100
Update to 17.12
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
---
diff --cc .gitignore
index 4025d64,1975fd2..9e38eaf
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,3 +1,10 @@@
/shotcut-17.10.tar.gz
+<<<<<<< HEAD
++<<<<<<< HEAD
/shotcut-17.11.tar.gz
+=======
++=======
++/shotcut-17.11.tar.gz
++>>>>>>> master
/shotcut-17.12.tar.gz
+>>>>>>> master