Skip to content

GitLab

gstlal
gstlal

Maintenance will be performed on git.ligo.org, chat.ligo.org, containers.ligo.org, and docs.ligo.org tomorrow, 2020/08/04, starting at approximately 9am PDT. It is expected to take around 15 minutes and there will be a short period of downtime towards the end of the maintenance window. Please direct any comments, questions or concerns to computing-help@ligo.org.

Commit 2c717183 authored by Alexander Pace's avatar Alexander Pace
Browse files
Options

fixing botched merge

parent 30a880ca
Pipeline #70814 passed with stages
                in 28 minutes and 56 seconds
                Hide whitespace changes
                Inline Side-by-side
                Showing with 0 additions and 7 deletions
                gstlal-ugly/configure.ac
                View file @ 2c717183
                ......@@ -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
                View file @ 2c717183
                <<<<<<< 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
                ......
                Markdown is supported
                0% or
                You are about to add 0 people to the discussion. Proceed with caution.
                Finish editing this message first!
                Please register or to comment