merge errors

2014-12-16 09:23:47 +01:00
parent 881df624b3
commit d26ab277af
4 changed files with 19 additions and 36 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -166,15 +166,14 @@ Fetsite::Application.routes.draw do
      resources :documents 
      resources :meetings do
        member do
-
          get :announce
          get :create_protocol
          get :create_agenda 
        end
-
-      end
-
+        
      end
+      
+    
      resources :meetingtyps
    end
  end