Resolve conflict

src/Components/Loader.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/AntiCheat.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/ArenaLength.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/AssetHandler.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <StdInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/AssetInterfaces/IComWorld.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <StdInclude.hpp>
 
 #define IW4X_COMMAP_VERSION 0
 

src/Components/Modules/AssetInterfaces/IFont_s.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define STB_TRUETYPE_IMPLEMENTATION
 #include <stb_truetype.h>

src/Components/Modules/AssetInterfaces/IFxEffectDef.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <StdInclude.hpp>
 
 #define IW4X_FX_VERSION 1
 

src/Components/Modules/AssetInterfaces/IFxWorld.cpp

@@ -1,4 +1,4 @@
-#include "StdInclude.hpp"
+#include <StdInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IGameWorldMp.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <StdInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IGameWorldSp.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <StdInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IGfxImage.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <StdInclude.hpp>
 
 #define IW4X_IMG_VERSION "0"
 

src/Components/Modules/AssetInterfaces/IGfxLightDef.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define IW4X_LIGHT_VERSION "0"
 

src/Components/Modules/AssetInterfaces/IGfxWorld.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define IW4X_GFXMAP_VERSION 1
 

src/Components/Modules/AssetInterfaces/ILoadedSound.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/ILocalizeEntry.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IMapEnts.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IMaterial.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define IW4X_MAT_VERSION "1"
 

src/Components/Modules/AssetInterfaces/IMaterialPixelShader.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define IW4X_TECHSET_VERSION "0"
 

src/Components/Modules/AssetInterfaces/IMaterialTechniqueSet.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define IW4X_TECHSET_VERSION "0"
 

src/Components/Modules/AssetInterfaces/IMaterialVertexDeclaration.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define IW4X_TECHSET_VERSION "0"
 

src/Components/Modules/AssetInterfaces/IMaterialVertexShader.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <StdInclude.hpp>
 
 #define IW4X_TECHSET_VERSION "0"
 

src/Components/Modules/AssetInterfaces/IMenuList.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IPhysCollmap.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IPhysPreset.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IRawFile.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/ISndCurve.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IStringTable.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IStructuredDataDefSet.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/ITracerDef.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IWeapon.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IXAnimParts.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define IW4X_ANIM_VERSION 1
 

src/Components/Modules/AssetInterfaces/IXModel.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define IW4X_MODEL_VERSION 5
 

src/Components/Modules/AssetInterfaces/IXModelSurfs.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/IclipMap_t.cpp

@@ -1,4 +1,4 @@
-#include "StdInclude.hpp"
+#include <StdInclude.hpp>
 
 #define IW4X_CLIPMAP_VERSION 2
 

src/Components/Modules/AssetInterfaces/ImenuDef_t.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <StdInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/AssetInterfaces/Isnd_alias_list_t.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Assets
 {

src/Components/Modules/Auth.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Bans.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Bots.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/CardTitles.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Changelog.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Chat.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Clantags.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/ClientCommand.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Command.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/ConnectProtocol.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Console.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/D3D9Ex.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Dedicated.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Discovery.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Download.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Download.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "Game/Functions.hpp"
+#include <Game/Functions.hpp>
 
 namespace Components
 {

src/Components/Modules/Dvar.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Elevators.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Exception.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/FastFiles.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/FileSystem.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Flags.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/FrameTime.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Friends.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Gamepad.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Gametypes.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/IPCPipe.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Lean.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Localization.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Logger.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/MapDump.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Maps.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Materials.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Menus.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/ModList.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/ModelSurfs.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Monitor.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 #undef getch
 #undef ungetch
 #include <conio.h>

src/Components/Modules/Movement.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/MusicalTalent.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Network.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/News.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 #define NEWS_MOTD_DEFAULT "Welcome to IW4x Multiplayer!"
 

src/Components/Modules/Node.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Party.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/PlayerName.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Playlist.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/QuickPatch.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/RCon.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/RawFiles.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Renderer.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Scheduler.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Script.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Script.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "Game/Structs.hpp"
+#include <Game/Structs.hpp>
 
 namespace Components
 {

src/Components/Modules/ServerCommands.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/ServerInfo.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/ServerList.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Session.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Singleton.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Slowmotion.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/SoundMutexFix.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/StartupMessages.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/Stats.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/StringTable.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/StructuredData.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Components
 {

src/Components/Modules/TextRenderer.cpp

@@ -1,4 +1,4 @@
-#include "STDInclude.hpp"
+#include <STDInclude.hpp>
 
 namespace Game
 {