- fix the update of debian-installer task

2004-04-14 11:02:29 +00:00 · 2004-04-14 11:02:29 +00:00 · a02cbdb6e2
parent 94974ba690
commit a02cbdb6e2
1 changed files with 0 additions and 3 deletions
--- 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