From e5f79420bda2720bb2af23b1e0d35df04e824f83 Mon Sep 17 00:00:00 2001
From: Dhruv Bansal <dhruv@ph.utexas.edu>
Date: Wed, 20 Feb 2013 11:39:47 -0600
Subject: [PATCH] ignore Gemfile.lock from now on

---
 .gitignore | 60 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 57eccc2..d3221d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,11 @@
-\#*
-.\#*
-*~
-.DS_Store
-Icon?
-REVISION
-TAGS*
-nohup.out
-.bzr
-.hg
-.svn
 
-a.out
+
+
+
+
+
+
+*.log
 *.o
 *.pyc
 *.so
@@ -18,32 +13,39 @@ a.out
 *.sw?
 *.tmproj
 *_flymake.*
+*private*
+*~
+.DS_Store
+.\#*
+.bzr
+.hg
 .project
 .pydevproject
 .settings
+.svn
 .tasks-cache
 .yardoc
-
-*.log
-
-*private*
-/log/*
-/pkg/*
-/tmp/*
-/coverage
-
-/db/*.sqlite3
+/Gemfile.lock
+/config/apeyeye.yaml
 /config/database.yml
 /config/private.yml
+/config/routes.rb
 /config/settings.yml
 /config/sphinx.yml
+/coverage
+/db/*.sqlite3
+/log/*
+/pkg/*
 /public/stylesheets/compiled/*
-
-/webrat.log
+/target
+/tmp/*
 /vendor/webrat/vendor
-
+/webrat.log
+Gemfile.lock
+Icon?
+REVISION
+TAGS*
+\#*
+a.out
 doc
-
-/config/apeyeye.yaml
-/config/routes.rb
-/target
+nohup.out