From: Evan Coury <me@evancoury.com>
Date: Wed, 23 May 2012 16:25:22 +0000 (-0700)
Subject: Remove and gitignore composer.lock file
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=657c1a3afe8f4d2e2ad2ed0ef6d4dba9bba6dd4f;hp=a1ef4bda06a0e7178e6656cc87d54fbde1a4c195;p=zf2.biz%2Fgalerie.git

Remove and gitignore composer.lock file
---

diff --git a/.gitignore b/.gitignore
index f86d474..11b4e7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+composer.lock
 nbproject
 ._*
 .~lock.*
@@ -5,4 +6,4 @@ nbproject
 .DS_Store
 .idea
 .project
-.settings
\ No newline at end of file
+.settings
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index f0922d0..0000000
--- a/composer.lock
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "hash": "aeff3640d146b3542c567f85bb07ab23",
-    "packages": [
-        {
-            "package": "zendframework/zendframework",
-            "version": "dev-master",
-            "source-reference": "5188f29db00222584de2e775dbf7fd004a2600b5",
-            "alias-pretty-version": "2.0.x-dev",
-            "alias-version": "2.0.9999999.9999999-dev"
-        },
-        {
-            "package": "zendframework/zendframework",
-            "version": "dev-master",
-            "source-reference": "5188f29db00222584de2e775dbf7fd004a2600b5"
-        },
-        {
-            "package": "zendframework/zendframework",
-            "version": "dev-master",
-            "source-reference": "5188f29db00222584de2e775dbf7fd004a2600b5",
-            "alias-pretty-version": "2.0.x-dev",
-            "alias-version": "2.0.9999999.9999999-dev"
-        },
-        {
-            "package": "zendframework/zendframework",
-            "version": "dev-master",
-            "source-reference": "fedd11dce74ca2ec20c1370915be06615e91b9d2",
-            "alias-pretty-version": "2.0.x-dev",
-            "alias-version": "2.0.9999999.9999999-dev"
-        }
-    ],
-    "packages-dev": null,
-    "aliases": [
-
-    ],
-    "minimum-stability": "dev",
-    "stability-flags": {
-        "zendframework/zendframework": 20
-    }
-}