fix mistake in merge conflict resolution

Author: danielsdeleo

chef-server-api/lib/chef-server-api.rb

@@ -71,17 +71,6 @@ def self.activate
         Chef::Log.info('Loading roles')
         Chef::Role.sync_from_disk_to_couchdb
 
-        # Create the default WebUI admin user "admin" if not already exists
-        begin
-          user = Chef::WebUIUser.load(Chef::Config[:web_ui_admin_user_name])
-        rescue Chef::Exceptions::CouchDBNotFound => e
-          user = Chef::WebUIUser.new
-          user.name = Chef::Config[:web_ui_admin_user_name]
-          user.set_password(Chef::Config[:web_ui_admin_default_password])
-          user.admin = true
-          user.save
-        end
-
         # Create the signing key and certificate 
         Chef::Certificate.generate_signing_ca