W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-15 04:23:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup some merge conflicts

Browse Source
This commit is contained in:
ebaydayz
2016-03-04 14:29:49 -05:00
parent 61c64cb14a
commit 732c2fe5a0
8 changed files with 10 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/config.cpp
View File

@@ -116,8 +116,6 @@ class CfgAddons
#include "Configs\RscDisplay\safegui.hpp"
#include "Configs\RscDisplay\dialog.hpp"
#include "Configs\RscDisplay\deathboards.hpp"
<<<<<<< HEAD
=======
#include "Configs\CfgVehicles.hpp"
#include "Configs\CfgWeapons.hpp"
@@ -131,6 +129,6 @@ class CfgAddons
#include "Configs\CfgAmmo.hpp"
#include "Configs\CfgLoot\CfgBuildingLoot.hpp"
#include "Configs\CfgArma.hpp"
>>>>>>> upstream/master
#include "Configs\CfgExtra\snappoints.hpp"
#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.h"