recorded battle merge conflicts fix

1 files changed, 2 insertions, 0 deletions

diff --git a/data/maps/RusturfTunnel/map.bin b/data/maps/RusturfTunnel/map.bin
new file mode 100644
index 000000000..87ce9bc73
--- /dev/null
+++ b/data/maps/RusturfTunnel/map.bin
@@ -0,0 +1,2 @@
+3!43!!!4
2222
2
2@<A@<<<A22
2
2
2
222222
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
22
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
22																	
+
2
2
2
2
2
2
2
2
23!!4
2
2
2
2
2
2
2
2
2
234@<<A342
2
2
2
22
2
2
2
2
2@A@A2
2
2222222
22	PQR			3!4
2
2									@<A
2
2
23!!4 					"2222
2
2
2
2
234@<<A342
2
2
2
2
2
2
2
2
2			"@A 		@A
2
2
2
2
2
2
2
2
2
2
2
2
2	" 	
2
2
2
2
2
2
2
2
2222
2 					
2
2
2
2					PQR		34
2
2
2
2	 										@A
2
2
2
2 											222 		PQR		3!4								3!4@<A											@<A
\ No newline at end of file