Commit 5595d7f9 authored by Jelmer Vernooij's avatar Jelmer Vernooij Committed by Holger Levsen
Browse files

Just fetch and overwrite from origin rather than merging.



Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent b0823de3