summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Sprauer <Sprauer@inline.de>2013-11-13 18:31:05 +0100
committerMichael Sprauer <Sprauer@inline.de>2013-11-13 18:31:05 +0100
commit67a661e27827b37274ce3dd5a50600966add6565 (patch)
tree5e4890b9deccca6c5754993a2853d28b81560473 /.gitignore
parenta570472bf987589427ba513d9a611a6994b4c197 (diff)
downloadgitlab-ci-67a661e27827b37274ce3dd5a50600966add6565.tar.gz
fixed one merge error
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 39a6f31..389225b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ tmp/*
.rvmrc
coverage/*
.ruby-version
+/vendor \ No newline at end of file