Oops, missed a bit with the merge.

2026-03-27 11:14:31 -04:00 · 2012-12-05 21:08:24 +11:00
parent 59083882d6
commit 87ef580b78
1 changed files with 0 additions and 1 deletions
--- 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