fixed merge conflict
authorlianah <lianahady@gmail.com>
Thu, 19 Jun 2014 22:52:55 +0000 (18:52 -0400)
committerlianah <lianahady@gmail.com>
Thu, 19 Jun 2014 22:52:55 +0000 (18:52 -0400)
commit33324a13308886291d802d69a23993226d557d1a
tree7f153f077ed27aca65a543f828bc6e75eeafb26c
parent61258d16bb812c5b5c8fb8dade1d2b497c69570b
parentb31dd70bd29e0dbce0a171799e648b499e54cb59
fixed merge conflict