From ad3fca33d3532f5dcffd22e5b88d3169675f43d0 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <alan.rj.huang@gmail.com>
Date: Sat, 1 Aug 2015 12:30:16 -0400
Subject: Attempt to make yellow buildable.

Building Errors: Segmentation Error.
---
 constants/type_constants.asm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'constants/type_constants.asm')

diff --git a/constants/type_constants.asm b/constants/type_constants.asm
index 095a3d28..66085f8d 100755
--- a/constants/type_constants.asm
+++ b/constants/type_constants.asm
@@ -13,8 +13,4 @@ GRASS    EQU $16
 ELECTRIC EQU $17
 PSYCHIC  EQU $18
 ICE      EQU $19
-<<<<<<< HEAD
-DRAGON   EQU $1A
-=======
-DRAGON   EQU $1A
->>>>>>> d48ea223eaad84af95e4f29043c279b56aa4ae88
+DRAGON   EQU $1A
\ No newline at end of file
-- 
cgit v1.3.1-sl0p