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.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Streaming.h')

diff --git a/src/Streaming.h b/src/Streaming.h
index e92819e1..d397bb18 100644
--- a/src/Streaming.h
+++ b/src/Streaming.h
@@ -161,5 +161,4 @@ public:
 	static void LoadInitialVehicles(void);
 
 	static void LoadScene(CVector *pos);
-	static void LoadAllRequestedModels(bool);
 };
-- 
cgit v1.2.3