solve merge conflict

2022-10-11 22:38:34 -04:00
parent d32b0ea4e4
commit 2dc7f3e667
1 changed files with 2 additions and 1 deletions
--- 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;