merge confilct

app/Http/Controllers/Invoice.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class Invoice extends Controller
+{
+    //
+}

routes/api.php

@@ -132,6 +132,7 @@ Route::group(['middleware' => ['role:admin']], function() {
 	
 	// New routes for invoice
 	Route::get('invoice/{id}', 'InvoiceController@show');
+	
 	Route::post('invoice/{id}', 'InvoiceController@create');
 	Route::put('invoice/{id}', 'InvoiceController@edit');
 	Route::patch('invoice/{id}/status', 'InvoiceController@updateStatus');