From fa132bb773394764feb453b08c4785364f19adf5 Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Wed, 26 Jun 2019 23:47:23 +0300
Subject: Fixed merge errors

---
 src/Streaming.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Streaming.cpp')

diff --git a/src/Streaming.cpp b/src/Streaming.cpp
index 149de7c3..93232a28 100644
--- a/src/Streaming.cpp
+++ b/src/Streaming.cpp
@@ -1585,7 +1585,6 @@ CStreaming::UpdateMemoryUsed(void)
 }
 
 WRAPPER void CStreaming::LoadScene(CVector *pos) { EAXJMP(0x40A6D0); }
-WRAPPER void CStreaming::LoadAllRequestedModels(bool) { EAXJMP(0x40A440); }
 
 bool
 CStreamingInfo::GetCdPosnAndSize(uint32 &posn, uint32 &size)
-- 
cgit v1.2.3