Merge pull request #6634 from monishdeb/CRM-17073

[civicrm-core.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9e086e9b90955495844c45550cbb59b7525322de..a4646d878137867f525a9fc8b2bd37bae2072097 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 *~
 *.bak
 bower_components
-composer.lock
 CRM/ACL/DAO
 CRM/Activity/DAO
 CRM/Auction/DAO
@@ -94,6 +93,7 @@ CRM/Core/DAO/Website.php
 CRM/Core/DAO/WordReplacement.php
 CRM/Core/DAO/Worldregion.php
 CRM/Core/I18n/SchemaStructure.php
+CRM/Cxn/DAO
 CRM/Dedupe/DAO
 CRM/Event/Cart/DAO
 CRM/Event/DAO
@@ -147,6 +147,7 @@ drupal/
 WordPress
 joomla
 packages/
+tests/output
 tests/phpunit/CiviTest/civicrm.settings.local.php
 tests/phpunit/CiviTest/truncate.xml
 tools/scripts/releaser/releaser.conf