resolve merge conflict
This commit is contained in:
parent
118548cf8e
commit
b3b6cf1584
1 changed files with 0 additions and 1 deletions
|
@ -212,4 +212,3 @@ cdef class AIndex_Double (Index):
|
||||||
|
|
||||||
def get(self):
|
def get(self):
|
||||||
return self.cpp_index.get().A_get()
|
return self.cpp_index.get().A_get()
|
||||||
>>>>>>> 75d3cab2b6bc00bbde0d9a33ebc5c89d77333f34
|
|
||||||
|
|
Loading…
Reference in a new issue