From 0daffe9bd8d5754b969974100b9bb535ad0bc5ca Mon Sep 17 00:00:00 2001 From: David Glasser Date: Wed, 7 Jan 2015 17:14:01 -0800 Subject: [PATCH] Remove duplicate code Duplication was introduced at merge c78e04645d9. Commit ccc2526 (right-hand side of merge) moved this code from the bottom to the middle. Commit 21411b4 added a newline at the end of the file, which made this a conflicted merge; the merge conflict was not resolved properly. Fixes #3208. --- examples/todos/lib/router.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/examples/todos/lib/router.js b/examples/todos/lib/router.js index abb50cc968..f26cb957c4 100644 --- a/examples/todos/lib/router.js +++ b/examples/todos/lib/router.js @@ -61,8 +61,3 @@ Router.map(function() { } }); }); - -if (Meteor.isClient) { - Router.onBeforeAction('loading', {except: ['join', 'signin']}); - Router.onBeforeAction('dataNotFound', {except: ['join', 'signin']}); -}