From 3ff48667a0dcef92d0d439d8900b40559d911716 Mon Sep 17 00:00:00 2001
From: rr- <rr-@sakuya.pl>
Date: Tue, 23 Aug 2016 21:56:48 +0200
Subject: [PATCH] client/auth: fix swapped tag deleting and merging

---
 client/js/controllers/tag_controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/js/controllers/tag_controller.js b/client/js/controllers/tag_controller.js
index e0e8feb..0951b16 100644
--- a/client/js/controllers/tag_controller.js
+++ b/client/js/controllers/tag_controller.js
@@ -38,8 +38,8 @@ class TagController {
                 canEditImplications: api.hasPrivilege('tags:edit:implications'),
                 canEditSuggestions: api.hasPrivilege('tags:edit:suggestions'),
                 canEditDescription: api.hasPrivilege('tags:edit:description'),
-                canMerge: api.hasPrivilege('tags:delete'),
-                canDelete: api.hasPrivilege('tags:merge'),
+                canMerge: api.hasPrivilege('tags:merge'),
+                canDelete: api.hasPrivilege('tags:delete'),
                 categories: categories,
             });