From 636e64a1f47d22db98e06defea0b37ea250cacd3 Mon Sep 17 00:00:00 2001
From: Robert Beckebans <robert.beckebans@gmail.com>
Date: Fri, 18 Nov 2022 16:58:08 +0100
Subject: [PATCH] Astyle after merge conflicts

---
 neo/renderer/ModelManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/neo/renderer/ModelManager.cpp b/neo/renderer/ModelManager.cpp
index f1cb3987..5ca6b088 100644
--- a/neo/renderer/ModelManager.cpp
+++ b/neo/renderer/ModelManager.cpp
@@ -389,7 +389,7 @@ idRenderModel* idRenderModelManagerLocal::GetModel( const char* _modelName, bool
 	// determine which subclass of idRenderModel to initialize
 
 	idRenderModel* model = NULL;
-	
+
 	// HvG: GLTF 2 support
 	if( isGLTF )
 	{
@@ -679,7 +679,7 @@ void idRenderModelManagerLocal::ReloadModels( bool forceAll )
 		{
 			continue;
 		}
-		
+
 		bool isGLTF = false;
 		idStr filename = model->Name();
 		idStr extension;