solve merge conflicts

1 files changed, 5 insertions, 0 deletions

diff --git a/helper.rb b/helper.rb
index 80707c3..799135b 100644
--- a/helper.rb
+++ b/helper.rb
@@ -91,5 +91,10 @@ helpers do
     haml :neighbors_navigation, :layout => false
   end
 
+  def models_navigation
+    @page = 0 unless @page
+    haml :models_navigation, :layout => false
+  end
+
 end