From 7e8659c4eeaa6e9e984ffed598a183d39d3a2086 Mon Sep 17 00:00:00 2001
From: ExpoSeed <>
Date: Tue, 2 Mar 2021 14:17:48 -0600
Subject: [PATCH] Fix missed merge conflict

---
 include/pokemon.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/pokemon.h b/include/pokemon.h
index 71189d6c0d..07f7f00fc7 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -244,14 +244,12 @@ struct Evolution
     u16 targetSpecies;
 };
 
-<<<<<<< HEAD
 struct FormChange {
     u16 method;
     u16 targetSpecies;
     u16 param1;
     u16 param2;
 };
-=======
 #define NUM_UNOWN_FORMS 28
 
 #define GET_UNOWN_LETTER(personality) ((   \
@@ -260,7 +258,6 @@ struct FormChange {
     | (((personality) & 0x00000300) >> 6)  \
     | (((personality) & 0x00000003) >> 0)  \
 ) % NUM_UNOWN_FORMS)
->>>>>>> b2a541a33b2a5116f6780f1830f2606a5dbc065e
 
 extern u8 gPlayerPartyCount;
 extern struct Pokemon gPlayerParty[PARTY_SIZE];