summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2012-05-04 08:40:06 +0000
committerChristoph Helma <helma@in-silico.ch>2012-05-04 08:40:06 +0000
commit20f7289875c3b928663e421c717d9e06b89fe6f1 (patch)
treef7163ff55f75f89a3671ef3e7bad8c7ab4a29b07 /.gitignore
parent7823d94600673060d3194cbd70c766486dbd592f (diff)
parenta4de970229858e0bcb0427bf70b536f474babaf1 (diff)
Merge branch 'development' of github.com:opentox/opentox-server into development
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4040c6c..6a65a36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
*.gem
.bundle
-Gemfile.lock
pkg/*