fix merge conflicts

2026-09-16 16:31:38 -04:00 · 2014-08-18 13:23:29 -04:00
parent 56704fd269
commit 1b7e40b827
2 changed files with 19 additions and 18 deletions
@@ -36,7 +36,7 @@
                %a{href: bike_path(@bike)} View Your Bike
            %ul{class: "nav navbar-nav navbar-right"}
              %li
-                %input{id: "index_logout", value: "Logout", "data-url" => destroy_user_session_path }
+                %a{href: destroy_user_session_path } Log Out

    .container
      - if flash[:notice]