resolve merge conflict

2023-05-10 01:24:52 +02:00 · 2023-05-10 01:24:52 +02:00 · b3b6cf1584
commit b3b6cf1584
parent 118548cf8e
1 changed files with 0 additions and 1 deletions
--- a/cnorxz/base/base.pyx
+++ b/cnorxz/base/base.pyx
@ -212,4 +212,3 @@ cdef class AIndex_Double (Index):
    
    def get(self):
        return self.cpp_index.get().A_get()
->>>>>>> 75d3cab2b6bc00bbde0d9a33ebc5c89d77333f34