Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Urban committed Mar 19, 2020
2 parents ecdf53f + 44c6af4 commit 615aac8
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions gwpy/table/tests/test_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,6 @@ def test_filter(self, table):
utils.assert_table_equal(
midf, table.filter('frequency > 100').filter('frequency < 1000'))

# check unicode parsing
table.filter(u'snr > 100')

def test_filter_in_segmentlist(self, table):
# check filtering on segments works
segs = SegmentList([Segment(100, 200), Segment(400, 500)])
Expand Down

0 comments on commit 615aac8

Please sign in to comment.