From a02cbdb6e268ff81baea0a63fcacac836655b8d4 Mon Sep 17 00:00:00 2001
From: Santiago Garcia Mantinan <manty@debian.org>
Date: Wed, 14 Apr 2004 11:02:29 +0000
Subject: [PATCH] - fix the update of debian-installer task

---
 tasks/debian-installer | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tasks/debian-installer b/tasks/debian-installer
index 18d19b05..8fa1dd3b 100644
--- a/tasks/debian-installer
+++ b/tasks/debian-installer
@@ -601,10 +601,7 @@ fat-modules-2.4.25-amiga-di
 fbset-udeb
 hw-detect-full
 ipv6-modules-2.2.25-mac-di
-<<<<<<< debian-installer
 ipv6-modules-2.4.25-amiga-di
-=======
->>>>>>> 1.13
 iso-3166-udeb
 jfs-modules-2.4.25-amiga-di
 jfsutils-udeb