From 10af88ddd712415f2a0a2b6124187d51075c95d5 Mon Sep 17 00:00:00 2001
From: "U-Daniel-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 8 Jun 2015 01:52:50 -0500
Subject: text.o

Conflicts:
	main.asm
	text.asm
	text/maps/cerulean_trade_house.asm
	text/maps/copycats_house_1f.asm
	text/maps/daycare_2.asm
	text/maps/museum_2f.asm
	text/maps/oaks_lab.asm
	text/maps/pewter_gym.asm
	text/maps/route_9_1.asm
	text/maps/school.asm
	text/maps/vermilion_gym_1.asm
	wram.asm
	yellow/text.asm
---
 main.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 060f9adf..fc41fa9f 100755
--- a/main.asm
+++ b/main.asm
@@ -6148,6 +6148,7 @@ INCLUDE "scripts/pokemontower7.asm"
 INCLUDE "data/mapObjects/pokemontower7.asm"
 PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk"
 
+<<<<<<< HEAD
 INCLUDE "data/mapHeaders/celadonmart1.asm"
 INCLUDE "scripts/celadonmart1.asm"
 INCLUDE "data/mapObjects/celadonmart1.asm"
@@ -6281,7 +6282,6 @@ Facility_Block:    INCBIN "gfx/blocksets/facility.bst"
 
 
 SECTION "bank1B",ROMX,BANK[$1B]
-
 Cemetery_GFX:      INCBIN "gfx/tilesets/cemetery.t4.2bpp"
 Cemetery_Block:    INCBIN "gfx/blocksets/cemetery.bst"
 Cavern_GFX:        INCBIN "gfx/tilesets/cavern.t14.2bpp"
-- 
cgit v1.3.1-sl0p