fix merge conflicts

This commit is contained in:
Mohit Panjwani
2020-01-05 13:45:10 +05:30
12 changed files with 1108 additions and 157 deletions

View File

@ -148,7 +148,8 @@ class CompanyController extends Controller
["code"=>"fr", "name" => "French"],
["code"=>"es", "name" => "Spanish"],
["code"=>"ar", "name" => "العربية"],
["code"=>"de", "name" => "German"]
["code"=>"de", "name" => "German"],
["code"=>"pt_BR", "name" => "Brazilian Portuguese"],
];
return response()->json([