Fix merge conflicts

7Cav · May 14, 2024 · 7cf1ddf · 7cf1ddf
1 parent 529632e
commit 7cf1ddf
Showing 1 changed file with 0 additions and 47 deletions.
diff --git 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
         ]]
     ]]
 ];