fix merge bug
authorBrian Demsky <bdemsky@uci.edu>
Wed, 19 Sep 2012 07:38:14 +0000 (00:38 -0700)
committerBrian Demsky <bdemsky@uci.edu>
Wed, 19 Sep 2012 07:38:14 +0000 (00:38 -0700)
commit3f947091862fee454da7f8f2723d67733d581a7d
tree135ce768e5551587810d2a2191e049724488e97f
parentb8a6522deb073737e7f07fdf7561c2879fa48033
fix merge bug
model.cc