# HG changeset patch
# User mir3636
# Date 1494757816 -32400
# Node ID d04cddc3f1a3c26fc1b7c54766c57d06d938b1bc
# Parent  54c9afe0c326536814ab3154c9423441f17571e6# Parent  c8d0fa3eea3b3554694fe4ecf134e30dde4a3cd3
merge

diff -r 54c9afe0c326 -r d04cddc3f1a3 paper/.DS_Store
Binary file paper/.DS_Store has changed
diff -r 54c9afe0c326 -r d04cddc3f1a3 paper/pic/.DS_Store
Binary file paper/pic/.DS_Store has changed