fix botched merge

CleverRaven · Jun 28, 2024 · 6a9582b · 6a9582b
1 parent 273d453
commit 6a9582b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -245,11 +245,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_display_357mag",
-<<<<<<< S&W619To686P
-    "items": [ { "item": "sw_619", "variant": "sw_619", "prob": 1 }, { "item": "colt_python", "prob": 2 } ]
-=======
     "items": [ { "item": "sw_619", "prob": 1 }, { "item": "rp63", "prob": 1 }, { "item": "colt_python", "prob": 2 } ]
->>>>>>> master
   },
   {
     "type": "item_group",