From 87ef580b786aba4709e8ee49c22be82b098cc2db Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Wed, 5 Dec 2012 21:08:24 +1100
Subject: [PATCH] Oops, missed a bit with the merge.

---
 config/routes.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index 6615706c0..94e715271 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,4 @@
 Growstuff::Application.routes.draw do
-<<<<<<< HEAD
   resources :gardens
   resources :updates
   resources :scientific_names