From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Sep 2015 19:37:50 +0000 (-0700)
Subject: composer.lock - update
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=04c3645265dc617a5f4d4a7f376d2e2e986e440a;p=civicrm-core.git

composer.lock - update

Previous merges left composer.lock with incorrect hash
---

diff --git a/composer.lock b/composer.lock
index bc00e51759..3fbeb9755d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7ae864fa67ed95c56a70091935a19c37",
+    "hash": "17a96ee2a893c966c2affd0eec056402",
+    "content-hash": "4ada5fd23e9e7d0dc464c7cc7857d65f",
     "packages": [
         {
             "name": "civicrm/civicrm-cxn-rpc",