why did this prompt a change stage? hello vscode?

The-Arcadis-Team · Feb 9, 2025 · 8d67d6f · 8d67d6f
1 parent ebf476e
commit 8d67d6f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -235,8 +235,6 @@
           tags:
             - CartridgeRifle
 
-<<<<<<< HEAD
-=======
 - type: entity
   name: Foam Force Astro Ace
   parent: [BaseWeaponShotgun, BaseGunWieldable]
@@ -278,4 +276,3 @@
         Blunt: 0
   - type: DamageOtherOnHit
     staminaCost: 3.5
->>>>>>> dd0bc24a682325f9d2c5d969d87d04073073785c