Fix improper patch rebase 81/14581/1
authorStanislaw Kardach <stanislaw.kardach@cavium.com>
Tue, 24 May 2016 14:21:06 +0000 (16:21 +0200)
committerStanislaw Kardach <stanislaw.kardach@cavium.com>
Tue, 24 May 2016 14:21:06 +0000 (16:21 +0200)
commit5dc680ca9524d8f2bd4ef1e2c198203a4c68480d
tree595bd3b178eb97dee89139a89c97e8d8cec8d297
parentea26f65dd99a1d23fb640051025f741e08eed0e9
Fix improper patch rebase

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch
patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch