fixing botched merge

gstlal-ugly/configure.ac

@@ -3,11 +3,7 @@
 #
 
 
-<<<<<<< Updated upstream
-AC_INIT([gstlal-ugly],[1.6.1],[gstlal-discuss@ligo.org],[gstlal-ugly])
-=======
 AC_INIT([gstlal-ugly],[1.6.5],[gstlal-discuss@ligo.org],[gstlal-ugly])
->>>>>>> Stashed changes
 AC_COPYRIGHT([Copyright (C) The authors (see source code for details)])
 # a file whose existance can be used to use to check that we are in the
 # top-level directory of the source tree

gstlal-ugly/debian/changelog

-<<<<<<< Updated upstream
-=======
 gstlal-ugly (1.6.5-1) unstable; urgency=low
 
   * gstlal_ll_inspiral_aggregator: remove unneccesary Pool, change how kafka
@@ -33,7 +31,6 @@ gstlal-ugly (1.6.2-1) unstable; urgency=low
 
  -- Alexander Pace <alexander.pace@ligo.org> Sun, 17 Mar 2019 09:37:07 -0700
 
->>>>>>> Stashed changes
 gstlal-ugly (1.6.1-1) unstable; urgency=low
 
   * interpolator: fix bug where interpolator was pushing out nongap buffers