From bbd1852b805769e05a8f2997ba4f472ff744793f Mon Sep 17 00:00:00 2001
From: Josef Ridky <jridky@redhat.com>
Date: Apr 25 2018 07:39:28 +0000
Subject: Fix merge conflict


---

diff --git a/.gitignore b/.gitignore
index 0c9b94a..97dbc77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ babl-0.1.2.tar.bz2
 /babl-0.1.38.tar.bz2
 /babl-0.1.40.tar.bz2
 /babl-0.1.42.tar.bz2
+/babl-0.1.44.tar.bz2
 /babl-0.1.46.tar.bz2
diff --git a/babl.spec b/babl.spec
index 095aaff..9aee65e 100644
--- a/babl.spec
+++ b/babl.spec
@@ -117,6 +117,9 @@ make check
 * Wed Apr 25 2018 Josef Ridky <jridky@redhat.com> - 0.1.46-1
 - New upstream release 0.1.46
 
+* Tue Mar 27 2018 Nils Philippsen <nils@tiptoe.de> - 0.1.44-1
+- version 0.1.44
+
 * Tue Feb 20 2018 Josef Ridky <jridky@redhat.com> - 0.1.42-4
 - add gcc requirement