From b9c071b9fdb9c71c4b9f72d69f88a8bbd96c941a Mon Sep 17 00:00:00 2001
From: Areloch <Areloch@gmail.com>
Date: Fri, 10 Sep 2021 15:14:57 -0500
Subject: [PATCH] Cleanup mismerge lines

---
 Engine/source/T3D/assets/assetImporter.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Engine/source/T3D/assets/assetImporter.cpp b/Engine/source/T3D/assets/assetImporter.cpp
index 380c9bcd6..5df1ca8ab 100644
--- a/Engine/source/T3D/assets/assetImporter.cpp
+++ b/Engine/source/T3D/assets/assetImporter.cpp
@@ -2433,8 +2433,6 @@ void AssetImporter::importAssets(AssetImportObject* assetItem)
 
             if (!refreshSuccess)
             {
-               const char* importReturnVal = Con::executef(this, processCommand.c_str(), childItem).getString();
-               assetPath = Torque::Path(importReturnVal);
                dSprintf(importLogBuffer, sizeof(importLogBuffer), "AssetImporter::importAssets - Failed to refresh reimporting asset %s.", item->assetName.c_str());
                activityLog.push_back(importLogBuffer);
             }