asd

public/assets/js/backend/protector.js

@@ -80,12 +80,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'selectpage', 'bootst
         follow: function () {
             Controller.api.bindevent();
         },
-<<<<<<< HEAD
-=======
         sign: function () {
             Controller.api.bindevent();
         },
->>>>>>> 517865d516aceb76c661257ea3de867a72cd753d
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));