From 2cec555dd5981caf75f76a71f5ee7d2b76b8bc11 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 25 Apr 2016 16:22:20 -0400
Subject: [PATCH] Fixed composer.json line endings; bumped up yaml dependency
 version.

---
 composer.json | 82 +++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/composer.json b/composer.json
index 083b6976e48..395b17ac8f4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,41 +1,41 @@
-{
-    "name": "vufind/vufind",
-    "description": "A flexible discovery layer.",
-    "authors": [
-        {
-            "name": "Demian Katz",
-            "email": "demian.katz@villanova.edu"
-        }
-    ],
-    "license": "GPL-2.0",
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://packages.zendframework.com/"
-        }
-    ],
-    "require": {
-        "aferrandini/phpqrcode": "1.0.1",
-        "jasig/phpcas": "1.3.3",
-        "cap60552/php-sip2": "1.0.0",
-        "los/losrecaptcha": "1.0.0",
-        "ahand/mobileesp": "dev-master",
-        "ocramius/proxy-manager": "1.0.2",
-        "oyejorge/less.php": "1.7.0.9",
-        "pear/file_marc": "1.1.2",
-        "pear/validate_ispn": "dev-master",
-        "serialssolutions/summon": "1.0.0",
-        "symfony/yaml": "2.7.6",
-        "vufind-org/vufindcode": "1.0.2",
-        "vufind-org/vufindhttp": "2.0.0",
-        "zendframework/zendframework": "2.4.6",
-        "zendframework/zendrest": "2.0.2",
-        "zendframework/zendservice-amazon": "2.0.4",
-        "zf-commons/zfc-rbac": "2.5.2"
-    },
-    "require-dev": {
-        "behat/mink": "1.7.0",
-        "behat/mink-selenium2-driver": "1.3.0",
-        "behat/mink-zombie-driver": "1.3.0"
-    }
-}
+{
+    "name": "vufind/vufind",
+    "description": "A flexible discovery layer.",
+    "authors": [
+        {
+            "name": "Demian Katz",
+            "email": "demian.katz@villanova.edu"
+        }
+    ],
+    "license": "GPL-2.0",
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://packages.zendframework.com/"
+        }
+    ],
+    "require": {
+        "aferrandini/phpqrcode": "1.0.1",
+        "jasig/phpcas": "1.3.3",
+        "cap60552/php-sip2": "1.0.0",
+        "los/losrecaptcha": "1.0.0",
+        "ahand/mobileesp": "dev-master",
+        "ocramius/proxy-manager": "1.0.2",
+        "oyejorge/less.php": "1.7.0.9",
+        "pear/file_marc": "1.1.2",
+        "pear/validate_ispn": "dev-master",
+        "serialssolutions/summon": "1.0.0",
+        "symfony/yaml": "3.0.4",
+        "vufind-org/vufindcode": "1.0.2",
+        "vufind-org/vufindhttp": "2.0.0",
+        "zendframework/zendframework": "2.4.6",
+        "zendframework/zendrest": "2.0.2",
+        "zendframework/zendservice-amazon": "2.0.4",
+        "zf-commons/zfc-rbac": "2.5.2"
+    },
+    "require-dev": {
+        "behat/mink": "1.7.0",
+        "behat/mink-selenium2-driver": "1.3.0",
+        "behat/mink-zombie-driver": "1.3.0"
+    }
+}
-- 
GitLab