summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-26 19:41:22 +0100
committerAzul <azul@leap.se>2012-11-26 19:41:22 +0100
commit81a00b2771d89335abb4fecaf6610fa2c8ad5113 (patch)
tree4601db2fca122b11ca84589b05a3e41d223c2050
parent54c469fd39fc865438e04c9c3e1e34783f90d62c (diff)
removing merge leftovers
-rw-r--r--users/app/views/sessions/_nav.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/users/app/views/sessions/_nav.html.haml b/users/app/views/sessions/_nav.html.haml
index 398a794..5306d0e 100644
--- a/users/app/views/sessions/_nav.html.haml
+++ b/users/app/views/sessions/_nav.html.haml
@@ -1,4 +1,4 @@
-but - if logged_in?
+- if logged_in?
- if admin?
%li.dropdown
= render 'sessions/admin_nav'