scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-07 03:17:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix up missed conflict

Browse source
This commit is contained in:
Matthew Jaffee 2017-12-22 11:14:12 -06:00 • committed by Travis Turner
parent 5314d61086
commit fab493c42b
No known key found for this signature in database
GPG key ID: 7F08008DFD9314C9
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roaring/roaring.go
View file

@ -362,12 +362,7 @@ func (b *Bitmap) IntersectionCount(other *Bitmap) uint64 {
// Intersect returns the intersection of b and other.
func (b *Bitmap) Intersect(other *Bitmap) *Bitmap {
<<<<<<< 49aec2dc4c2137c459c5ff4902609b93cfc72933
output := &Bitmap{}
=======
output := NewBitmap()
>>>>>>> fix a bunch of bugs and add some tests
iiter, _ := b.conts.Iterator(0)
jiter, _ := other.conts.Iterator(0)
i, j := iiter.Next(), jiter.Next()