[MIRROR] Fixes cargo import (#2061)

Fixes cargo import Co-authored-by: Jeremiah <[email protected]> Co-authored-by: Mal <[email protected]>
Fluffy-Frontier · Apr 19, 2024 · 4ab6457 · 4ab6457
1 parent cd8ed59
commit 4ab6457
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/tgui/packages/tgui/interfaces/Cargo.jsx b/tgui/packages/tgui/interfaces/Cargo.jsx
@@ -1,5 +1,8 @@
 import { filter, sortBy } from 'common/collections';
+<<<<<<< HEAD
 import { flow } from 'common/fp';
+=======
+>>>>>>> 0312a9f7d9a ([MIRROR] Fixes cargo import (#2061))
 
 import { useBackend, useSharedState } from '../backend';
 import {