commit 8390aa7ff9a972c8937ea8d6efb08d80c27b9cf9 Author: Martin Gansser <martinkg(a)fedoraproject.org&gt; Date: Fri Dec 8 15:43:03 2017 +0100 Update to 17.12 .gitignore | 7 ------- 1 file changed, 7 deletions(-) --- diff --git a/.gitignore b/.gitignore index 9e38eaf..1975fd2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ /shotcut-17.10.tar.gz -<<<<<<< HEAD -<<<<<<< HEAD /shotcut-17.11.tar.gz -======= -======= -/shotcut-17.11.tar.gz ->>>>>>> master /shotcut-17.12.tar.gz ->>>>>>> master