From b4c22982cbfc35a1d57991212ee8eae9014d7fa2 Mon Sep 17 00:00:00 2001
From: Ivan Lanin <ivanlanin@gmail.com>
Date: Sun, 27 Apr 2014 12:26:39 +0700
Subject: [PATCH] Update .gitignore

---
 .gitignore                 | 13 ++++++-------
 samples/results/.gitignore |  2 ++
 samples/results/.gitkeep   |  0
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 samples/results/.gitignore
 delete mode 100644 samples/results/.gitkeep

diff --git a/.gitignore b/.gitignore
index 2ea4fd9d..eb0f0679 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,13 +4,12 @@
 .Trashes
 Thumbs.db
 Desktop.ini
-.idea
-_build
-phpunit.xml
 composer.lock
 composer.phar
-vendor
-/report
-/.settings
+phpunit.xml
 /.buildpath
-/.project
\ No newline at end of file
+/.idea
+/.project
+/.settings
+/build
+/vendor
diff --git a/samples/results/.gitignore b/samples/results/.gitignore
new file mode 100644
index 00000000..c96a04f0
--- /dev/null
+++ b/samples/results/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/samples/results/.gitkeep b/samples/results/.gitkeep
deleted file mode 100644
index e69de29b..00000000