update conflict

src/views/SimproV2/Gantt/index.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import Timeline from 'react-calendar-timeline'
 import 'react-calendar-timeline/lib/Timeline.css'
-import { USER_VERSION_GANTT_SEARCH, BASE_SIMPRO_LUMEN } from '../../../const/ApiConst';
+import { USER_VERSION_GANTT_SEARCH, BASE_SIMPRO_LUMEN, BASE_URL_GANTT } from '../../../const/ApiConst';
 import axios from "../../../const/interceptorApi"
 
 const token = localStorage.getItem("token")
@@ -77,7 +77,7 @@ const Gantt = (props) => {
   const RenderGantt = () => (
     <iframe
       id="frame-gantt"
-      src={`https://ospro-gantt.ospro.id/src/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${localStorage.getItem('token')}&ro=${ro}`}
+      src={`https://${BASE_URL_GANTT}?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${localStorage.getItem('token')}&ro=${ro}`}
       style={{
         width: '100%',
         height: '75vh',