resolve conflict
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 6 Nov 2010 20:16:41 +0000 (15:16 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 6 Nov 2010 20:16:41 +0000 (15:16 -0500)
commitf3b2b0c98c32ac9526c113db230a067767c204b1
treec8adaa8d5192918ad510364dc5a0ee210b7bb237
parent0b8608fe7537e01976f2d0364dca12fe531ce262
resolve conflict

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
Gemfile.lock