From d0e4c6297874d9fc726656e66bc45f2b17bc7a89 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Wed, 14 Nov 2018 23:50:02 -0500
Subject: [PATCH] fix merge conflict

---
 interface/src/ModelPropertiesDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/ModelPropertiesDialog.cpp b/interface/src/ModelPropertiesDialog.cpp
index a32d8adefb..1bdb170b60 100644
--- a/interface/src/ModelPropertiesDialog.cpp
+++ b/interface/src/ModelPropertiesDialog.cpp
@@ -26,7 +26,7 @@
 #include <OffscreenUi.h>
 
 
-ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
+ModelPropertiesDialog::ModelPropertiesDialog(const QVariantHash& originalMapping,
                                              const QString& basePath, const HFMModel& hfmModel) :
 _originalMapping(originalMapping),
 _basePath(basePath),