Skip to content

Commit

Permalink
let's make a conflict
Browse files Browse the repository at this point in the history
# Conflicts:
#	routes/api.php
  • Loading branch information
Nathan-Cowin committed Nov 26, 2024
1 parent 9ae30aa commit a04dc74
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
});

Route::get('/test', function () {
return 'testing this is ahead';
return 'testing another conflict';
});

0 comments on commit a04dc74

Please sign in to comment.