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

@ -44,11 +44,13 @@ class OnboardingController extends Controller
$date_formats = DateFormatter::get_list();
$time_zones = TimeZones::get_list();
$languages = [
["code"=>"ar", "name" => "Arabic"],
["code"=>"en", "name" => "English"],
["code"=>"fr", "name" => "French"],
["code"=>"es", "name" => "Spanish"],
["code"=>"ar", "name" => "العربية"],
["code"=>"de", "name" => "German"]
["code"=>"de", "name" => "German"],
["code"=>"pt-br", "name" => "Portuguese (Brazilian)"]
];
$fiscal_years = [
['key' => 'january-december' , 'value' => '1-12'],