From d2c64a7b5bfa14957b3491d0031de60100bdc268 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 14 Apr 2015 11:25:29 +0800
Subject: [PATCH] MDL-49840 testing: Stop ignoring composer.lock

---
 .gitignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 89ea0d6d5a7..1dab0f7a5c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,9 +26,8 @@ CVS
 /.buildpath
 /.cache
 phpunit.xml
-# Composer support - only composer.json is to be in git, the rest is installed in each checkout.
+# Composer support. Do not ignore composer.json, or composer.lock. These should be shipped by us.
 composer.phar
-composer.lock
 /vendor/
 /behat.yml
 */yui/build/*/*-coverage.js