# HG changeset patch
# User Christian Urban <christian dot urban at kcl dot ac dot uk>
# Date 1439439896 -28800
# Node ID c8daac05d6a8c7a8058c72aaeab7f8c210ad2aed
# Parent  c582c6ebceeb6f6573fa287bb240d8d15a3093f8
merge

diff -r c582c6ebceeb -r c8daac05d6a8 travel_guide/.DS_Store
Binary file travel_guide/.DS_Store has changed