solved conflict

app/Http/Controllers/ProjectController.php

@@ -231,9 +231,8 @@ class ProjectController extends Controller
 
 	public function dashboard($id)
 	{ 
-		// $data = Project::WHERE("id", $id)->first();
 		$data = DB::table('m_proyek as mp')
-					->select('mp.kode_sortname', 'mp.nama as name_project', 'mp.mulai_proyek as start', 'mp.akhir_proyek as finish', 'mp.rencana_biaya', 'mp.company', 'mu.name as pm')
+					->select('mp.kode_sortname', 'mp.nama as name_project', 'mp.mulai_proyek as start', 'mp.akhir_proyek as finish', 'mp.rencana_biaya', 'mp.company', 'mp.currency_symbol', 'mu.name as pm')
 					->join('m_users as mu', 'mu.id', '=', 'mp.pm_id')
 					->where('mp.id', $id)
 					->get();