We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
| 1 | <?php |
||
| 8 | ||||||| merged common ancestors |
||
| 9 | use DoeSangue\User; |
||
| 10 | ======= |
||
| 11 | |||
| 12 | use DoeSangue\Http\Requests\UserProfileRequest; |
||
| 13 | use DoeSangue\Models\User; |
||
| 14 | use Illuminate\Http\Request; |
||
| 15 | use DoeSangue\Http\Controllers\Controller; |
||
| 16 | |||
| 17 | >>>>>>> 4c37c57 |
||
| 18 | |||
| 19 | class UsersController extends Controller |
||
| 20 | { |
||
| 21 | public function index() |
||
| 22 | { |
||
| 23 | <<<<<<< HEAD |
||
| 24 | $users = User::orderBy('name', 'id')->get(); |
||
| 25 | ||||||| merged common ancestors |
||
| 26 | $usuarios = User::orderBy('name', 'id')->get(); |
||
| 27 | ======= |
||
| 52 |