recorded battle merge conflicts fix

1 files changed, 1 insertions, 0 deletions

diff --git a/data/maps/FallarborTown/map.bin b/data/maps/FallarborTown/map.bin
new file mode 100644
index 000000000..950a54761
--- /dev/null
+++ b/data/maps/FallarborTown/map.bin
@@ -0,0 +1 @@
+yyyyyiiiiiiiiiiiiijiiiiiiiiiiiijziiiiij"##$��JKLMNjziiiiijz�����6�6RSTUVzi����jzi�����2y2Z[\]^q2q2PQRSzii����y2#6bcdef#6y2XYZ[q2q2q2y2y2y2y2#6jklmn#6y2�ab�y2y2�2�2y2y2y2y2y2�2�2�2y2y2y2y2�2�2y2y2y2y2y2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2y2y2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2y2y2�2�2�2�2y2y2y2y2y2�2�2y2y2�2�2�2�2y2y2y2y2y2y2y2y2y2y2y2y2�2�2y2�2�2�2�2y2y2y2y2y2y2y2y2y2 3!3y2y2�2�2y20123y2�2y2%3&3'3y2}2~2(3)3y2y2�2�2y289:;22y2-3.3/3y2����y2�2�2�2y2�AB�6t6y2536373y2����y2y2�2�2�2�2�2y2�22l2y2y2y2y2����y2y2�2�2�2�2�2y22s6t6k222�2y2y2y2y2y2y2y2y2y2222l6kllklk2222222222st6sts6t6
\ No newline at end of file