From 243d62ff0e94affb9991d70eacede5bbdcd0ecf9 Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Mon, 6 Feb 2017 11:33:48 +0000
Subject: [PATCH] Fix small issue from merge conflict

---
 app/views/layouts/_navbar.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
index 6d293ca6..3b9b25c2 100644
--- a/app/views/layouts/_navbar.html.erb
+++ b/app/views/layouts/_navbar.html.erb
@@ -84,7 +84,7 @@
       <ul class="right">
         <% if user_signed_in? %>
         <li>
-          <a class="dropdown-button tooltipped" href="#!" data-activates="user-dropdown" data-position="bottom" data-delay="100" data-tooltip="Your content">
+          <a class="dropdown-button tooltipped" href="#!" data-activates="desktop-user-dropdown" data-position="bottom" data-delay="100" data-tooltip="Your content">
             <div class="hide-on-med-and-up"><i class="material-icons">book</i></div>
             <div class="hide-on-small-and-down"><%= current_user.name %> &nbsp; ▾</div>
           </a>