@@ -65,11 +65,7 @@ return [
'hrm2_url' => env('HRM2_URL'),
-<<<<<<< HEAD
- 'asset_version' => 76,
-=======
'asset_version' => 77,
->>>>>>> b16934c846d5810ca190affd4985c9f9409515d8
'temp_dir' => env('TEMP_DIR'),