# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2015-02-05 17:29:52
# Node ID 7cf62e1e74ba8a57c8843016af594fdc57984d2d
# Parent  48aa6e78d5d1f99f9ed2da7107a8abd041b4ef6f
# Parent  8e3bcb1b6fcaf13c9495cda68f06c09be2e865b0

confusing merge

diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb
--- a/app/controllers/user_admin_controller.rb
+++ b/app/controllers/user_admin_controller.rb
@@ -2,7 +2,6 @@
 
 class UserAdminController < ApplicationController
 
-
   include MailHelperMethods
 
   before_filter :admin_authorization