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

Fix merge

Browse Source
This commit is contained in:
Bailey Danyluk 2024-05-27 21:21:39 -06:00
parent 9db3160e7f
commit 6a58d6c5b1
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/missileguidance/XEH_PREP.hpp
View File

@ -54,11 +54,7 @@ PREP(gps_attackOnFired);
// Seeker OnFired // Seeker OnFired
PREP(SACLOS_onFired); PREP(SACLOS_onFired);
PREP(mwr_onFired); PREP(mwr_onFired);
<<<<<<< HEAD
=======
PREP(IR_onFired);
PREP(gps_seekerOnFired); PREP(gps_seekerOnFired);
>>>>>>> parent of 744cd45ee (remove gps definitions)
// Navigation OnFired // Navigation OnFired
PREP(proNav_onFired); PREP(proNav_onFired);