# Conflicts: # app/Http/Controllers/ServerController.php # composer.lock # resources/lang/de.json # resources/lang/en.json # resources/views/servers/index.blade.php |
||
---|---|---|
.. | ||
Seeds | ||
DatabaseSeeder.php | ||
DevelopmentSeeder.php | ||
ExampleItemsSeeder.php |
# Conflicts: # app/Http/Controllers/ServerController.php # composer.lock # resources/lang/de.json # resources/lang/en.json # resources/views/servers/index.blade.php |
||
---|---|---|
.. | ||
Seeds | ||
DatabaseSeeder.php | ||
DevelopmentSeeder.php | ||
ExampleItemsSeeder.php |