From 4ab645790f6321656fcfc41ff5993aeb01ef0af8 Mon Sep 17 00:00:00 2001
From: NovaBot <154629622+NovaBot13@users.noreply.github.com>
Date: Thu, 18 Apr 2024 21:33:30 -0400
Subject: [PATCH] [MIRROR] Fixes cargo import (#2061)

Fixes cargo import

Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Mal <13398309+vinylspiders@users.noreply.github.com>
---
 tgui/packages/tgui/interfaces/Cargo.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tgui/packages/tgui/interfaces/Cargo.jsx b/tgui/packages/tgui/interfaces/Cargo.jsx
index 5f50d5b05d7..41bca94b68d 100644
--- 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 {