# HG changeset patch
# User Mehrdad <myvaigha@staffmail.ed.ac.uk>
# Date 1302619519 -3600
# Node ID dd99d900006c20a59c3a9004936f6fc02dd5014e
# Parent  51aa5a4932b047e4bc91d4c58841cd3892038ad7
modification to box.m

diff -r 51aa5a4932b0 -r dd99d900006c box.m
--- a/box.m	Tue Apr 12 15:42:27 2011 +0100
+++ b/box.m	Tue Apr 12 15:45:19 2011 +0100
@@ -1,1 +1,2 @@
-%% The rice mdwt crashed on my matlab session runing on linux 64!!!
\ No newline at end of file
+%% The rice mdwt crashed on my matlab session runing on linux 64!!!
+% problem with hg merge using EasyMercurial. (This is a test)
\ No newline at end of file