fixes conflicts with fork

2016-06-17 19:40:30 +02:00
parent 9f195350a3
commit 98040e191e
8 changed files with 29 additions and 2 deletions
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -87,6 +87,17 @@
            <% end %>
          </div>

+          <div>
+            <%= f.label :official_position_badge do %>
+              <%= f.check_box :official_position_badge,
+                               title: t('account.show.official_position_badge_label'),
+                               label: false %>
+              <span class="checkbox">
+                <%= t("account.show.official_position_badge_label") %>
+              </span>
+            <% end %>
+          </div>
+
          <%= f.submit t("account.show.save_changes_submit"), class: "button" %>
        </div>