Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #371 from EpochModTeam/experimental

Browse Source 
fix merge issue
This commit is contained in:
vbawol 2015-09-11 09:20:09 -05:00
commit 29c6b3928a
8 changed files with 0 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Sources/mpmissions/epoch.Altis/description.ext
View File

@ -36,24 +36,7 @@ wreckLimit = 2;
wreckRemovalMinTime = 60; wreckRemovalMinTime = 60;
wreckRemovalMaxTime = 360; wreckRemovalMaxTime = 360;
<<<<<<< HEAD
class cfgFunctions class cfgFunctions
=======
class CfgRemoteExec
{
class Functions
{
mode = 0;
jip = 0;
};
class Commands
{
mode=0;
};
};
class CfgEpochClient
>>>>>>> master
{ {
class A3E class A3E
{ {

17
Sources/mpmissions/epoch.Australia/description.ext
View File

@ -36,24 +36,7 @@ wreckLimit = 2;
wreckRemovalMinTime = 60; wreckRemovalMinTime = 60;
wreckRemovalMaxTime = 360; wreckRemovalMaxTime = 360;
<<<<<<< HEAD
class cfgFunctions class cfgFunctions
=======
class CfgRemoteExec
{
class Functions
{
mode = 0;
jip = 0;
};
class Commands
{
mode=0;
};
};
class CfgEpochClient
>>>>>>> master
{ {
class A3E class A3E
{ {

17
Sources/mpmissions/epoch.Bornholm/description.ext
View File

@ -36,24 +36,7 @@ wreckLimit = 2;
wreckRemovalMinTime = 60; wreckRemovalMinTime = 60;
wreckRemovalMaxTime = 360; wreckRemovalMaxTime = 360;
<<<<<<< HEAD
class cfgFunctions class cfgFunctions
=======
class CfgRemoteExec
{
class Functions
{
mode = 0;
jip = 0;
};
class Commands
{
mode=0;
};
};
class CfgEpochClient
>>>>>>> master
{ {
class A3E class A3E
{ {

17
Sources/mpmissions/epoch.Chernarus/description.ext
View File

@ -36,24 +36,7 @@ wreckLimit = 2;
wreckRemovalMinTime = 60; wreckRemovalMinTime = 60;
wreckRemovalMaxTime = 360; wreckRemovalMaxTime = 360;
<<<<<<< HEAD
class cfgFunctions class cfgFunctions
=======
class CfgRemoteExec
{
class Functions
{
mode = 0;
jip = 0;
};
class Commands
{
mode=0;
};
};
class CfgEpochClient
>>>>>>> master
{ {
class A3E class A3E
{ {

17
Sources/mpmissions/epoch.Chernarus_Summer/description.ext
View File

@ -36,24 +36,7 @@ wreckLimit = 2;
wreckRemovalMinTime = 60; wreckRemovalMinTime = 60;
wreckRemovalMaxTime = 360; wreckRemovalMaxTime = 360;
<<<<<<< HEAD
class cfgFunctions class cfgFunctions
=======
class CfgRemoteExec
{
class Functions
{
mode = 0;
jip = 0;
};
class Commands
{
mode=0;
};
};
class CfgEpochClient
>>>>>>> master
{ {
class A3E class A3E
{ {

17
Sources/mpmissions/epoch.Esseker/description.ext
View File

@ -36,24 +36,7 @@ wreckLimit = 2;
wreckRemovalMinTime = 60; wreckRemovalMinTime = 60;
wreckRemovalMaxTime = 360; wreckRemovalMaxTime = 360;
<<<<<<< HEAD
class cfgFunctions class cfgFunctions
=======
class CfgRemoteExec
{
class Functions
{
mode = 0;
jip = 0;
};
class Commands
{
mode=0;
};
};
class CfgEpochClient
>>>>>>> master
{ {
class A3E class A3E
{ {

17
Sources/mpmissions/epoch.Stratis/description.ext
View File

@ -36,24 +36,7 @@ wreckLimit = 2;
wreckRemovalMinTime = 60; wreckRemovalMinTime = 60;
wreckRemovalMaxTime = 360; wreckRemovalMaxTime = 360;
<<<<<<< HEAD
class cfgFunctions class cfgFunctions
=======
class CfgRemoteExec
{
class Functions
{
mode = 0;
jip = 0;
};
class Commands
{
mode=0;
};
};
class CfgEpochClient
>>>>>>> master
{ {
class A3E class A3E
{ {

17
Sources/mpmissions/epoch.Takistan/description.ext
View File

@ -36,24 +36,7 @@ wreckLimit = 2;
wreckRemovalMinTime = 60; wreckRemovalMinTime = 60;
wreckRemovalMaxTime = 360; wreckRemovalMaxTime = 360;
<<<<<<< HEAD
class cfgFunctions class cfgFunctions
=======
class CfgRemoteExec
{
class Functions
{
mode = 0;
jip = 0;
};
class Commands
{
mode=0;
};
};
class CfgEpochClient
>>>>>>> master
{ {
class A3E class A3E
{ {