resolve merge noise in favor of new upstream. note that this tosses out the

[debian/gzip] / .tarball-version

diff --git a/.tarball-version b/.tarball-version
index 085c0f2666ace5b88d67bf565bbe30fbe054e551..c068b2447cc22327bcac3f4884de3b32025c5bb2 100644 (file)
--- a/.tarball-version
+++ b/.tarball-version
@@ -1 +1 @@
-1.3.14
+1.4