Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
gstlal
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
14
Issues
14
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lscsoft
gstlal
Commits
2c717183
Commit
2c717183
authored
Jul 18, 2019
by
Alexander Pace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing botched merge
parent
30a880ca
Pipeline
#70814
passed with stages
in 28 minutes and 56 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
7 deletions
+0
-7
gstlal-ugly/configure.ac
gstlal-ugly/configure.ac
+0
-4
gstlal-ugly/debian/changelog
gstlal-ugly/debian/changelog
+0
-3
No files found.
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment