From ed979912cced73d16dd2884b78c62cc2ace2989e Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 30 Dec 2016 08:15:12 +0000
Subject: [PATCH] Combine .gitignore files

---
 .composer/.gitignore | 1 -
 .gitignore           | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 .composer/.gitignore

diff --git a/.composer/.gitignore b/.composer/.gitignore
deleted file mode 100644
index 48b8bf9..0000000
--- a/.composer/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor/
diff --git a/.gitignore b/.gitignore
index 9f2dd3b..e2f174a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 !.*
+.composer/cache/
+.composer/vendor/