From 7cf1ddf43b61e92fdd5b67d38f04c02f66f189bd Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Tue, 14 May 2024 12:26:55 -0400 Subject: [PATCH] Fix merge conflicts --- cScripts/cScripts_pylons.sqf | 47 ------------------------------------ 1 file changed, 47 deletions(-) diff --git a/cScripts/cScripts_pylons.sqf b/cScripts/cScripts_pylons.sqf index 5d8248043..755fa2b65 100644 --- a/cScripts/cScripts_pylons.sqf +++ b/cScripts/cScripts_pylons.sqf @@ -106,7 +106,6 @@ ["cav_dragoon_base_F", [ ["antiarmor", [ -<<<<<<< HEAD ["displayName", "Anti-Armor"], ["icon", ""], ["loadout",[ @@ -124,21 +123,6 @@ ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]] -======= - ["SmokeLauncherMag",[0],6], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ->>>>>>> upstream/main ]], // ["antiair", [ // ["SmokeLauncherMag",[0,0],6], @@ -155,7 +139,6 @@ // ["4Rnd_Titan_long_missiles",[0],4] // ]], ["default",[ -<<<<<<< HEAD ["displayName", "Anti-Personnel"], ["icon", ""], ["loadout",[ @@ -192,36 +175,6 @@ ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ]] -======= - ["SmokeLauncherMag",[0],6], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] - ]], - ["balanced",[ - ["SmokeLauncherMag",[0],6], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_mag_300Rnd_762x51_Belt_Red",[0],300], - ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_HEI_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78], - ["cav_78Rnd_30mm_APFSDS_shells_Tracer_Red",[0],78] ->>>>>>> upstream/main ]] ]] ]; \ No newline at end of file