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 | 3d8d656fa7911524e0e6885647173474524e0784 (patch) | |
tree | 81b1ee2fcb67980376d03f0aa48e42e53abff222 /python/src/sa/int_list.pxi | |
parent | be7f57fdd484e063775d7abf083b9fa4c403b610 (diff) | |
parent | 96fedabebafe7a38a6d5928be8fff767e411d705 (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): |