ugh, stupid git merge UX

This commit is contained in:
George Hotz 2016-01-31 18:16:02 +00:00
parent 64def4d61c
commit 6ea62c71a9
1 changed files with 0 additions and 4 deletions

View File

@ -30,10 +30,6 @@ if [ ! -d qemu/qemu-latest ]; then
wget http://wiki.qemu-project.org/download/qemu-$QEMU_VERSION.tar.bz2
HASH=`sha256sum ./qemu-"$QEMU_VERSION".tar.bz2 2>/dev/null | cut -d' ' -f1`
<<<<<<< HEAD
=======
>>>>>>> 55078b2deb6730d383eef04beb9baf5f38076900
if [ "$HASH" != "$QEMU_SHA256" ]; then
echo "Error: qemu-"$QEMU_VERSION".tar.bz2 has an invalid checksum."
exit 1