From a762101f64f5045be0134817b6434d7cb2cde294 Mon Sep 17 00:00:00 2001
From: lucfd <83493765+lucfd@users.noreply.github.com>
Date: Thu, 25 Apr 2024 01:07:08 -0400
Subject: [PATCH] fixing merge conflicts

---
 src/data/ability.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index cced00c6c7f..1bef03a8c26 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -3195,8 +3195,6 @@ export function initAbilities() {
       .attr(NoFusionAbilityAbAttr),
     new Ability(Abilities.QUICK_DRAW, "Quick Draw", "Enables the Pokémon to move first occasionally.", 8)
       .attr(IncrementMovePriorityAbAttr, (pokemon, move) => move.category !== MoveCategory.STATUS && Math.random() <= 1/3, 0.01),
-    new Ability(Abilities.QUICK_DRAW, 8)
-      .unimplemented(),
     new Ability(Abilities.UNSEEN_FIST, 8)
       .unimplemented(),
     new Ability(Abilities.CURIOUS_MEDICINE, 8)