snipe-it/resources/lang/en/admin/reports/general.php

<?php

<<<<<<< HEAD
return [
    'info'   => 'Select the options you want for your asset report.',
];
=======
return array(
    'info'   => 'Select the options you want for your asset report.',
    'deleted_user' => 'Deleted user',
    'send_reminder' => 'Send reminder',
    'reminder_sent' => 'Reminder sent',
    'acceptance_deleted' => 'Acceptance request deleted',
    'acceptance_request' => 'Acceptance request'
);
>>>>>>> Unaccepted Assets Report Actions (send reminder, delete) added
Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00			`<?php`

Unaccepted Assets Report Actions (send reminder, delete) added Unaccepted Assets Export fixed 2021-05-03 12:06:12 -07:00			`<<<<<<< HEAD`
Adopt Laravel coding style Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions. You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started. [1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200 2021-06-10 13:15:52 -07:00			`return [`
			`'info' => 'Select the options you want for your asset report.',`
			`];`
Unaccepted Assets Report Actions (send reminder, delete) added Unaccepted Assets Export fixed 2021-05-03 12:06:12 -07:00			`=======`
			`return array(`
			`'info' => 'Select the options you want for your asset report.',`
			`'deleted_user' => 'Deleted user',`
			`'send_reminder' => 'Send reminder',`
			`'reminder_sent' => 'Reminder sent',`
			`'acceptance_deleted' => 'Acceptance request deleted',`
			`'acceptance_request' => 'Acceptance request'`
			`);`
			`>>>>>>> Unaccepted Assets Report Actions (send reminder, delete) added`