diff options
author | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
---|---|---|
committer | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
commit | 5b8253e0e1f1393a509fb9975ba8c1347af758ed (patch) | |
tree | 1790470b1d07a0b4973ebce19192e896566ea60b /python/src/sa/int_list.pxi | |
parent | 2389a5a8a43dda87c355579838559515b0428421 (diff) | |
parent | b203f8c5dc8cff1b9c9c2073832b248fcad0765a (diff) |
fixed conflicts
Diffstat (limited to 'python/src/sa/int_list.pxi')
-rw-r--r-- | python/src/sa/int_list.pxi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/src/sa/int_list.pxi b/python/src/sa/int_list.pxi index 55f5d174..79d67ad9 100644 --- a/python/src/sa/int_list.pxi +++ b/python/src/sa/int_list.pxi @@ -26,7 +26,7 @@ cdef class IntList: ret += str(self.arr[idx]) ret += "]" ret += "len=" - ret += self.len + ret += str(self.len) return ret def index(self, val): |