Use diff3 conflicts.
authorPierre Habouzit <madcoder@debian.org>
Mon, 28 Dec 2009 18:26:38 +0000 (19:26 +0100)
committerPierre Habouzit <madcoder@debian.org>
Mon, 28 Dec 2009 18:26:38 +0000 (19:26 +0100)
Signed-off-by: Pierre Habouzit <madcoder@debian.org>

No differences found