User deletion fixes

2014-09-11 19:01:48 +05:30 · 2014-09-11 19:01:48 +05:30 · 8e8d049af0
commit 8e8d049af0
parent 6890802a78
5 changed files with 5 additions and 10 deletions
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@ -63,4 +63,3 @@
        "bLengthChange": false
      } );
  } );
->>>>>>> User deletion