CRM-16134 - Merge case activity created by should be logged in user.

[civicrm-core.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9e557754c1a9b91125381a85adf83cdabe6c3a74..2b816aa5a04e87d1010bfe04f285f9d776c25556 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 *~
 *.bak
 bower_components
-composer.lock
 CRM/ACL/DAO
 CRM/Activity/DAO
 CRM/Auction/DAO