# HG changeset patch
# User Cezary Kaliszyk <kaliszyk@in.tum.de>
# Date 1271254244 -7200
# Node ID 9a8decba77c50cc9cca5017be1db98e909518833
# Parent  9978fc6d91e9865165f240624c5b8e0bbac9246b# Parent  edc2a52cd457bb8e40f368ef388e3408ae1fa567
merge

diff -r 9978fc6d91e9 -r 9a8decba77c5 Nominal/Lift.thy