aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-06-07 14:19:21 +0100
committerRobin Houston <robin.houston@gmail.com>2012-06-07 14:19:21 +0100
commit5108fbd47c28422ec4aa2b63833362b9c49a5eef (patch)
tree0ca0279b6440f7b66428f1e8eb792424442580eb
parenta9c192f454f1bad310f5758ffbd2179d23d6f57b (diff)
Remove duplicate from Gemfile.lock
I think this was a bad merge during the recent rebase of this branch (feature/public-body-api)
-rw-r--r--Gemfile.lock1
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index cf9475774..86eb1a87d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,7 +17,6 @@ GEM
activeresource (2.3.14)
activesupport (= 2.3.14)
activesupport (2.3.14)
- annotate (2.4.0)
columnize (0.3.6)
fakeweb (1.3.0)
fast_gettext (0.6.1)