From 2dc7f3e667fc0ac62e8aa1573d490ccbbbcff707 Mon Sep 17 00:00:00 2001
From: Modnark <66146584+Modnark@users.noreply.github.com>
Date: Tue, 11 Oct 2022 22:38:34 -0400
Subject: [PATCH] solve merge conflict

---
 src/include/DataModelV2/PartInstance.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/include/DataModelV2/PartInstance.h b/src/include/DataModelV2/PartInstance.h
index ffdf211..ffbfce4 100644
--- a/src/include/DataModelV2/PartInstance.h
+++ b/src/include/DataModelV2/PartInstance.h
@@ -16,7 +16,8 @@ public:
 	//Rendering
 	virtual void PartInstance::postRender(RenderDevice* rd);
 	virtual void render(RenderDevice*);
-	
+	virtual void renderName(RenderDevice*);
+
 	//Surfaces
 	Enum::SurfaceType::Value top;
 	Enum::SurfaceType::Value front;