summaryrefslogtreecommitdiff
path: root/src/Streaming.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-06-26 23:47:23 +0300
committerNikolay Korolev <nickvnuk@gmail.com>2019-06-26 23:47:23 +0300
commitfa132bb773394764feb453b08c4785364f19adf5 (patch)
tree6ca5314aa824d2bf5fefd45698a66c59ee9c3b18 /src/Streaming.h
parent08b053a568e15dd318dcfc46eaa6393af4a5f8c4 (diff)
Fixed merge errors
Diffstat (limited to 'src/Streaming.h')
-rw-r--r--src/Streaming.h1
1 files changed, 0 insertions, 1 deletions
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);
};