# resolved conflicts: # fp-includes/smarty/internals/core.rm_auto.php # fp-includes/smarty/internals/core.rmdir.php