Skip to content

Commit 5b74983

Browse files
committed
Missing line
1 parent 5c1f88a commit 5b74983

1 file changed

Lines changed: 0 additions & 13 deletions

File tree

src/components/BMDashboard/RentalChart/ReturnedLateChart.jsx

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -274,26 +274,13 @@ export default function ReturnedLateChart() {
274274
>
275275
Tools:
276276
</label>
277-
<<<<<<< HEAD
278-
<div id="tools-select" className={styles['returned-late-tools-select']}>
279-
<MultiSelect
280-
options={availableTools}
281-
value={selectedTools}
282-
onChange={setSelectedTools}
283-
labelledBy="tools-select"
284-
className={`${darkMode ? 'dark' : ''} ${darkMode ? styles['background-dark'] : ''}`}
285-
/>
286-
</div>
287-
=======
288-
289277
<MultiSelect
290278
options={availableTools}
291279
value={selectedTools}
292280
onChange={setSelectedTools}
293281
labelledBy="tools-select"
294282
className={styles['returned-late-tools-select']}
295283
/>
296-
>>>>>>> e018903ed503febddf4cd02a6d22b8a833c34992
297284
</div>
298285

299286
<div className={styles['returned-late-filter-group']}>

0 commit comments

Comments
 (0)