]> git.cworth.org Git - sup/commit
clean up some minor conflict mis-resolutions
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 17 Aug 2009 20:32:57 +0000 (13:32 -0700)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 17 Aug 2009 20:32:57 +0000 (13:32 -0700)
commit81ee8d587ed713ebef29c1e450f5bc2557119c07
treee1a04753a29b35accdabc7a73555290a2e1c2c97
parent631981cbbb728c0bfd62d91a89129169a8a6d2e1
clean up some minor conflict mis-resolutions
bin/sup
lib/sup/buffer.rb