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

manual merge

Browse Source
This commit is contained in:
commy2 2016-02-22 16:08:24 +01:00
parent c45523475f
commit ac3385fb83
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/interact_menu/CfgEventHandlers.hpp
View File

@ -24,12 +24,9 @@ class Extended_InitPost_EventHandlers {
};
};
};
<<<<<<< HEAD
class Extended_DisplayLoad_EventHandlers {
class RscDiary {
ADDON = QUOTE(call COMPILE_FILE(XEH_displayLoad));
};
};
=======
>>>>>>> 0f7bfc0f6654cef08f84b36fbc4fd4be2774777b